From 0f33c3eae75ae14488cb7c2a351ba5f9f87cdf9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Nov 2024 22:38:00 +0000 Subject: [PATCH 1/4] chore(deps-dev): bump the npm-dependencies group across 2 directories with 8 updates Bumps the npm-dependencies group with 8 updates in the / directory: | Package | From | To | | --- | --- | --- | | [prettier](https://github.com/prettier/prettier) | `3.3.3` | `3.4.1` | | [prettier-plugin-packagejson](https://github.com/matzkoh/prettier-plugin-packagejson) | `2.5.5` | `2.5.6` | | @tui-sandbox/library | `7.2.0` | `7.2.1` | | [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `22.9.1` | `22.10.1` | | [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `8.15.0` | `8.16.0` | | [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `8.15.0` | `8.16.0` | | [eslint](https://github.com/eslint/eslint) | `9.15.0` | `9.16.0` | | [type-fest](https://github.com/sindresorhus/type-fest) | `4.27.0` | `4.29.0` | Bumps the npm-dependencies group with 6 updates in the /integration-tests directory: | Package | From | To | | --- | --- | --- | | @tui-sandbox/library | `7.2.0` | `7.2.1` | | [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `22.9.1` | `22.10.1` | | [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `8.15.0` | `8.16.0` | | [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `8.15.0` | `8.16.0` | | [eslint](https://github.com/eslint/eslint) | `9.15.0` | `9.16.0` | | [type-fest](https://github.com/sindresorhus/type-fest) | `4.27.0` | `4.29.0` | Updates `prettier` from 3.3.3 to 3.4.1 - [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/3.3.3...3.4.1) Updates `prettier-plugin-packagejson` from 2.5.5 to 2.5.6 - [Release notes](https://github.com/matzkoh/prettier-plugin-packagejson/releases) - [Commits](https://github.com/matzkoh/prettier-plugin-packagejson/compare/v2.5.5...v2.5.6) Updates `@tui-sandbox/library` from 7.2.0 to 7.2.1 Updates `@types/node` from 22.9.1 to 22.10.1 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) Updates `@typescript-eslint/eslint-plugin` from 8.15.0 to 8.16.0 - [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/v8.16.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 8.15.0 to 8.16.0 - [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/v8.16.0/packages/parser) Updates `eslint` from 9.15.0 to 9.16.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v9.15.0...v9.16.0) Updates `type-fest` from 4.27.0 to 4.29.0 - [Release notes](https://github.com/sindresorhus/type-fest/releases) - [Commits](https://github.com/sindresorhus/type-fest/compare/v4.27.0...v4.29.0) Updates `@tui-sandbox/library` from 7.2.0 to 7.2.1 Updates `@types/node` from 22.9.1 to 22.10.1 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) Updates `@typescript-eslint/eslint-plugin` from 8.15.0 to 8.16.0 - [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/v8.16.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 8.15.0 to 8.16.0 - [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/v8.16.0/packages/parser) Updates `eslint` from 9.15.0 to 9.16.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v9.15.0...v9.16.0) Updates `type-fest` from 4.27.0 to 4.29.0 - [Release notes](https://github.com/sindresorhus/type-fest/releases) - [Commits](https://github.com/sindresorhus/type-fest/compare/v4.27.0...v4.29.0) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-dependencies - dependency-name: prettier-plugin-packagejson dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm-dependencies - dependency-name: "@tui-sandbox/library" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm-dependencies - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-dependencies - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-dependencies - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-dependencies - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-dependencies - dependency-name: type-fest dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-dependencies - dependency-name: "@tui-sandbox/library" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm-dependencies - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-dependencies - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-dependencies - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-dependencies - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-dependencies - dependency-name: type-fest dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-dependencies ... Signed-off-by: dependabot[bot] --- integration-tests/package.json | 12 +- package.json | 4 +- pnpm-lock.yaml | 234 ++++++++++++++++----------------- 3 files changed, 125 insertions(+), 125 deletions(-) diff --git a/integration-tests/package.json b/integration-tests/package.json index 834c4746..c1802588 100644 --- a/integration-tests/package.json +++ b/integration-tests/package.json @@ -15,18 +15,18 @@ "zod": "3.23.8" }, "devDependencies": { - "@tui-sandbox/library": "7.2.0", - "@types/node": "22.9.1", + "@tui-sandbox/library": "7.2.1", + "@types/node": "22.10.1", "@types/tinycolor2": "1.4.6", - "@typescript-eslint/eslint-plugin": "8.15.0", - "@typescript-eslint/parser": "8.15.0", + "@typescript-eslint/eslint-plugin": "8.16.0", + "@typescript-eslint/parser": "8.16.0", "concurrently": "9.1.0", - "eslint": "9.15.0", + "eslint": "9.16.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-no-only-tests": "3.3.0", "prettier-plugin-organize-imports": "4.1.0", "tinycolor2": "1.6.0", - "type-fest": "4.27.0", + "type-fest": "4.29.0", "typescript": "5.7.2" } } diff --git a/package.json b/package.json index 72ed51c5..48ab2179 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,8 @@ "devDependencies": { "@umbrelladocs/linkspector": "0.3.13", "markdownlint-cli2": "0.15.0", - "prettier": "3.3.3", - "prettier-plugin-packagejson": "2.5.5" + "prettier": "3.4.1", + "prettier-plugin-packagejson": "2.5.6" }, "packageManager": "pnpm@9.13.2" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0c8d1f5c..016bd79f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,11 +15,11 @@ importers: specifier: 0.15.0 version: 0.15.0 prettier: - specifier: 3.3.3 - version: 3.3.3 + specifier: 3.4.1 + version: 3.4.1 prettier-plugin-packagejson: - specifier: 2.5.5 - version: 2.5.5(prettier@3.3.3) + specifier: 2.5.6 + version: 2.5.6(prettier@3.4.1) integration-tests: dependencies: @@ -37,41 +37,41 @@ importers: version: 3.23.8 devDependencies: '@tui-sandbox/library': - specifier: 7.2.0 - version: 7.2.0(cypress@13.16.0)(prettier@3.3.3)(type-fest@4.27.0)(typescript@5.7.2) + specifier: 7.2.1 + version: 7.2.1(cypress@13.16.0)(prettier@3.4.1)(type-fest@4.29.0)(typescript@5.7.2) '@types/node': - specifier: 22.9.1 - version: 22.9.1 + specifier: 22.10.1 + version: 22.10.1 '@types/tinycolor2': specifier: 1.4.6 version: 1.4.6 '@typescript-eslint/eslint-plugin': - specifier: 8.15.0 - version: 8.15.0(@typescript-eslint/parser@8.15.0(eslint@9.15.0)(typescript@5.7.2))(eslint@9.15.0)(typescript@5.7.2) + specifier: 8.16.0 + version: 8.16.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0)(typescript@5.7.2))(eslint@9.16.0)(typescript@5.7.2) '@typescript-eslint/parser': - specifier: 8.15.0 - version: 8.15.0(eslint@9.15.0)(typescript@5.7.2) + specifier: 8.16.0 + version: 8.16.0(eslint@9.16.0)(typescript@5.7.2) concurrently: specifier: 9.1.0 version: 9.1.0 eslint: - specifier: 9.15.0 - version: 9.15.0 + specifier: 9.16.0 + version: 9.16.0 eslint-config-prettier: specifier: 9.1.0 - version: 9.1.0(eslint@9.15.0) + version: 9.1.0(eslint@9.16.0) eslint-plugin-no-only-tests: specifier: 3.3.0 version: 3.3.0 prettier-plugin-organize-imports: specifier: 4.1.0 - version: 4.1.0(prettier@3.3.3)(typescript@5.7.2) + version: 4.1.0(prettier@3.4.1)(typescript@5.7.2) tinycolor2: specifier: 1.6.0 version: 1.6.0 type-fest: - specifier: 4.27.0 - version: 4.27.0 + specifier: 4.29.0 + version: 4.29.0 typescript: specifier: 5.7.2 version: 5.7.2 @@ -277,8 +277,8 @@ packages: resolution: {integrity: sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@eslint/js@9.15.0': - resolution: {integrity: sha512-tMTqrY+EzbXmKJR5ToI8lxu7jaN5EdmrBFJpQk5JmSlyLsx6o4t27r883K5xsLuCYCpfKBCGswMSWXsM+jB7lg==} + '@eslint/js@9.16.0': + resolution: {integrity: sha512-tw2HxzQkrbeuvyj1tG2Yqq+0H9wGoI2IMk4EOsQeX+vmd75FtJAzf+gTA69WF+baUKRYQ3x2kbLE08js5OsTVg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@eslint/object-schema@2.1.4': @@ -364,19 +364,19 @@ packages: '@tootallnate/quickjs-emscripten@0.23.0': resolution: {integrity: sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==} - '@trpc/client@11.0.0-rc.643': - resolution: {integrity: sha512-Y7coaGHPxnzW9nZrigXInjSw3QoQ2IOIBnBaalC4m5B0Tt72j3UTc4gnELKDWxD/u3tRV7EoSnf8MvFhNsuDHA==} + '@trpc/client@11.0.0-rc.648': + resolution: {integrity: sha512-k4FfLKvJwbosUH8KYyZkC50RJHYtIyJECi5WhRXsvaf9a6lgrTlcA+osq815zYcAHo7wEgR9E9UdSTrpLdAQFQ==} peerDependencies: - '@trpc/server': 11.0.0-rc.643+0914e43c5 + '@trpc/server': 11.0.0-rc.648+77b4d8920 typescript: '>=5.6.2' - '@trpc/server@11.0.0-rc.643': - resolution: {integrity: sha512-w8qPtnbvKF441erzLjDX55AcgrC+5wXT3VCyBp8HMCUKJS4Q7LSEmig02Kva+gJ3E6cYTahsQFTDWaVnr26YZA==} + '@trpc/server@11.0.0-rc.648': + resolution: {integrity: sha512-nKW7FNM+QZrY/CVGlX3hFNIdUvbw6pwSJ+HzEF8GIeSJDKLHK7Ke1QJGI2mRW6oF9dCKMBXfuLaYY2dXfjfn7Q==} peerDependencies: typescript: '>=5.6.2' - '@tui-sandbox/library@7.2.0': - resolution: {integrity: sha512-4YLARWba3luoOkTdz9ZURIUT+gplYFubAwwtG1PKMuBjn1uModrFq5Q+amymht+qC721W4UTOiFYQqzqpxPiPw==} + '@tui-sandbox/library@7.2.1': + resolution: {integrity: sha512-Oot33wsISonReNH0vcsN1u6kJSqpTG8ogzl3fLol6qRulGXRWlvfnrUxOW5HQFXla8oypObsel/aNP0X2EpBhg==} hasBin: true peerDependencies: cypress: ^13 @@ -399,8 +399,8 @@ packages: '@types/ms@0.7.34': resolution: {integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==} - '@types/node@22.9.1': - resolution: {integrity: sha512-p8Yy/8sw1caA8CdRIQBG5tiLHmxtQKObCijiAa9Ez+d4+PRffM4054xbju0msf+cvhJpnFEeNjxmVT/0ipktrg==} + '@types/node@22.10.1': + resolution: {integrity: sha512-qKgsUwfHZV2WCWLAnVP1JqnpE6Im6h3Y0+fYgMTasNQ7V++CBX5OT1as0g0f+OyubbFqhf6XVNIsmN4IIhEgGQ==} '@types/sinonjs__fake-timers@8.1.1': resolution: {integrity: sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==} @@ -420,8 +420,8 @@ packages: '@types/yauzl@2.10.3': resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==} - '@typescript-eslint/eslint-plugin@8.15.0': - resolution: {integrity: sha512-+zkm9AR1Ds9uLWN3fkoeXgFppaQ+uEVtfOV62dDmsy9QCNqlRHWNEck4yarvRNrvRcHQLGfqBNui3cimoz8XAg==} + '@typescript-eslint/eslint-plugin@8.16.0': + resolution: {integrity: sha512-5YTHKV8MYlyMI6BaEG7crQ9BhSc8RxzshOReKwZwRWN0+XvvTOm+L/UYLCYxFpfwYuAAqhxiq4yae0CMFwbL7Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0 @@ -431,8 +431,8 @@ packages: typescript: optional: true - '@typescript-eslint/parser@8.15.0': - resolution: {integrity: sha512-7n59qFpghG4uazrF9qtGKBZXn7Oz4sOMm8dwNWDQY96Xlm2oX67eipqcblDj+oY1lLCbf1oltMZFpUso66Kl1A==} + '@typescript-eslint/parser@8.16.0': + resolution: {integrity: sha512-D7DbgGFtsqIPIFMPJwCad9Gfi/hC0PWErRRHFnaCWoEDYi5tQUDiJCTmGUbBiLzjqAck4KcXt9Ayj0CNlIrF+w==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 @@ -441,12 +441,12 @@ packages: typescript: optional: true - '@typescript-eslint/scope-manager@8.15.0': - resolution: {integrity: sha512-QRGy8ADi4J7ii95xz4UoiymmmMd/zuy9azCaamnZ3FM8T5fZcex8UfJcjkiEZjJSztKfEBe3dZ5T/5RHAmw2mA==} + '@typescript-eslint/scope-manager@8.16.0': + resolution: {integrity: sha512-mwsZWubQvBki2t5565uxF0EYvG+FwdFb8bMtDuGQLdCCnGPrDEDvm1gtfynuKlnpzeBRqdFCkMf9jg1fnAK8sg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/type-utils@8.15.0': - resolution: {integrity: sha512-UU6uwXDoI3JGSXmcdnP5d8Fffa2KayOhUUqr/AiBnG1Gl7+7ut/oyagVeSkh7bxQ0zSXV9ptRh/4N15nkCqnpw==} + '@typescript-eslint/type-utils@8.16.0': + resolution: {integrity: sha512-IqZHGG+g1XCWX9NyqnI/0CX5LL8/18awQqmkZSl2ynn8F76j579dByc0jhfVSnSnhf7zv76mKBQv9HQFKvDCgg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 @@ -455,12 +455,12 @@ packages: typescript: optional: true - '@typescript-eslint/types@8.15.0': - resolution: {integrity: sha512-n3Gt8Y/KyJNe0S3yDCD2RVKrHBC4gTUcLTebVBXacPy091E6tNspFLKRXlk3hwT4G55nfr1n2AdFqi/XMxzmPQ==} + '@typescript-eslint/types@8.16.0': + resolution: {integrity: sha512-NzrHj6thBAOSE4d9bsuRNMvk+BvaQvmY4dDglgkgGC0EW/tB3Kelnp3tAKH87GEwzoxgeQn9fNGRyFJM/xd+GQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/typescript-estree@8.15.0': - resolution: {integrity: sha512-1eMp2JgNec/niZsR7ioFBlsh/Fk0oJbhaqO0jRyQBMgkz7RrFfkqF9lYYmBoGBaSiLnu8TAPQTwoTUiSTUW9dg==} + '@typescript-eslint/typescript-estree@8.16.0': + resolution: {integrity: sha512-E2+9IzzXMc1iaBy9zmo+UYvluE3TW7bCGWSF41hVWUE01o8nzr1rvOQYSxelxr6StUvRcTMe633eY8mXASMaNw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '*' @@ -468,8 +468,8 @@ packages: typescript: optional: true - '@typescript-eslint/utils@8.15.0': - resolution: {integrity: sha512-k82RI9yGhr0QM3Dnq+egEpz9qB6Un+WLYhmoNcvl8ltMEededhh7otBVVIDDsEEttauwdY/hQoSsOv13lxrFzQ==} + '@typescript-eslint/utils@8.16.0': + resolution: {integrity: sha512-C1zRy/mOL8Pj157GiX4kaw7iyRLKfJXBR3L82hk5kS/GyHcOFmy4YUq/zfZti72I9wnuQtA/+xzft4wCC8PJdA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 @@ -478,8 +478,8 @@ packages: typescript: optional: true - '@typescript-eslint/visitor-keys@8.15.0': - resolution: {integrity: sha512-h8vYOulWec9LhpwfAdZf2bjr8xIp0KNKnpgqSz0qqYYKAW/QZKw3ktRndbiAtUz4acH4QLQavwZBYCc0wulA/Q==} + '@typescript-eslint/visitor-keys@8.16.0': + resolution: {integrity: sha512-pq19gbaMOmFE3CbL0ZB8J8BFCo2ckfHBfaIsaOZgBIF4EoISJIdLX5xRhd0FGB0LlHReNRuzoJoMGpTjq8F2CQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@umbrelladocs/linkspector@0.3.13': @@ -1018,8 +1018,8 @@ packages: resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - eslint@9.15.0: - resolution: {integrity: sha512-7CrWySmIibCgT1Os28lUU6upBshZ+GxybLOrmRzi08kS8MBuO8QA7pXEgYgY5W8vK3e74xv0lpjo9DbaGU9Rkw==} + eslint@9.16.0: + resolution: {integrity: sha512-whp8mSQI4C8VXd+fLgSM0lh3UlmcFtVwUQjyKCFfsp+2ItAIYhlq/hqGahGqHE6cv9unM41VlqKk2VtKYR2TaA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} hasBin: true peerDependencies: @@ -1899,16 +1899,16 @@ packages: vue-tsc: optional: true - prettier-plugin-packagejson@2.5.5: - resolution: {integrity: sha512-SvzImCwDluH29OgD37wDv96milAHhIQuYS+WN3iwQzonR8lqv0su7IdQYfLc3So+0MtuPSCEQF6tZYubTnf7xg==} + prettier-plugin-packagejson@2.5.6: + resolution: {integrity: sha512-TY7KiLtyt6Tlf53BEbXUWkN0+TRdHKgIMmtXtDCyHH6yWnZ50Lwq6Vb6lyjapZrhDTXooC4EtlY5iLe1sCgi5w==} peerDependencies: prettier: '>= 1.16.0' peerDependenciesMeta: prettier: optional: true - prettier@3.3.3: - resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==} + prettier@3.4.1: + resolution: {integrity: sha512-G+YdqtITVZmOJje6QkXQWzl3fSfMxFwm1tjTyo9exhkmWSqC4Yhd1+lug++IlR2mvRVAxEDDWYkQdeSztajqgg==} engines: {node: '>=14'} hasBin: true @@ -2106,8 +2106,8 @@ packages: sort-object-keys@1.1.3: resolution: {integrity: sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==} - sort-package-json@2.11.0: - resolution: {integrity: sha512-pBs3n/wcsbnMSiO5EYV4AVnZVtyQslfZ/0v6VbrRRVApqyNf0Uqo4MOXJsBmIplGY1hYZ4bq5qjO9xTgY+K8xw==} + sort-package-json@2.12.0: + resolution: {integrity: sha512-/HrPQAeeLaa+vbAH/znjuhwUluuiM/zL5XX9kop8UpDgjtyWKt43hGDk2vd/TBdDpzIyzIHVUgmYofzYrAQjew==} hasBin: true source-map@0.6.1: @@ -2273,8 +2273,8 @@ packages: resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==} engines: {node: '>=10'} - type-fest@4.27.0: - resolution: {integrity: sha512-3IMSWgP7C5KSQqmo1wjhKrwsvXAtF33jO3QY+Uy++ia7hqvgSK6iXbbg5PbDBc1P2ZbNEDgejOrN4YooXvhwCw==} + type-fest@4.29.0: + resolution: {integrity: sha512-RPYt6dKyemXJe7I6oNstcH24myUGSReicxcHTvCLgzm4e0n8y05dGvcGB15/SoPRBmhlMthWQ9pvKyL81ko8nQ==} engines: {node: '>=16'} type-is@1.6.18: @@ -2295,8 +2295,8 @@ packages: unbzip2-stream@1.4.3: resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==} - undici-types@6.19.8: - resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} + undici-types@6.20.0: + resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==} unicorn-magic@0.1.0: resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==} @@ -2567,9 +2567,9 @@ snapshots: '@esbuild/win32-x64@0.23.1': optional: true - '@eslint-community/eslint-utils@4.4.0(eslint@9.15.0)': + '@eslint-community/eslint-utils@4.4.0(eslint@9.16.0)': dependencies: - eslint: 9.15.0 + eslint: 9.16.0 eslint-visitor-keys: 3.4.3 '@eslint-community/regexpp@4.12.1': {} @@ -2598,7 +2598,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@eslint/js@9.15.0': {} + '@eslint/js@9.16.0': {} '@eslint/object-schema@2.1.4': {} @@ -2678,20 +2678,20 @@ snapshots: '@tootallnate/quickjs-emscripten@0.23.0': {} - '@trpc/client@11.0.0-rc.643(@trpc/server@11.0.0-rc.643(typescript@5.7.2))(typescript@5.7.2)': + '@trpc/client@11.0.0-rc.648(@trpc/server@11.0.0-rc.648(typescript@5.7.2))(typescript@5.7.2)': dependencies: - '@trpc/server': 11.0.0-rc.643(typescript@5.7.2) + '@trpc/server': 11.0.0-rc.648(typescript@5.7.2) typescript: 5.7.2 - '@trpc/server@11.0.0-rc.643(typescript@5.7.2)': + '@trpc/server@11.0.0-rc.648(typescript@5.7.2)': dependencies: typescript: 5.7.2 - '@tui-sandbox/library@7.2.0(cypress@13.16.0)(prettier@3.3.3)(type-fest@4.27.0)(typescript@5.7.2)': + '@tui-sandbox/library@7.2.1(cypress@13.16.0)(prettier@3.4.1)(type-fest@4.29.0)(typescript@5.7.2)': dependencies: '@catppuccin/palette': 1.7.1 - '@trpc/client': 11.0.0-rc.643(@trpc/server@11.0.0-rc.643(typescript@5.7.2))(typescript@5.7.2) - '@trpc/server': 11.0.0-rc.643(typescript@5.7.2) + '@trpc/client': 11.0.0-rc.648(@trpc/server@11.0.0-rc.648(typescript@5.7.2))(typescript@5.7.2) + '@trpc/server': 11.0.0-rc.648(typescript@5.7.2) '@xterm/addon-attach': 0.11.0(@xterm/xterm@5.5.0) '@xterm/addon-fit': 0.10.0(@xterm/xterm@5.5.0) '@xterm/xterm': 5.5.0 @@ -2703,9 +2703,9 @@ snapshots: express: 4.21.1 neovim: 5.3.0 node-pty: 1.0.0 - prettier: 3.3.3 + prettier: 3.4.1 tsx: 4.19.2 - type-fest: 4.27.0 + type-fest: 4.29.0 typescript: 5.7.2 winston: 3.17.0 zod: 3.23.8 @@ -2726,9 +2726,9 @@ snapshots: '@types/ms@0.7.34': {} - '@types/node@22.9.1': + '@types/node@22.10.1': dependencies: - undici-types: 6.19.8 + undici-types: 6.20.0 '@types/sinonjs__fake-timers@8.1.1': {} @@ -2742,18 +2742,18 @@ snapshots: '@types/yauzl@2.10.3': dependencies: - '@types/node': 22.9.1 + '@types/node': 22.10.1 optional: true - '@typescript-eslint/eslint-plugin@8.15.0(@typescript-eslint/parser@8.15.0(eslint@9.15.0)(typescript@5.7.2))(eslint@9.15.0)(typescript@5.7.2)': + '@typescript-eslint/eslint-plugin@8.16.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0)(typescript@5.7.2))(eslint@9.16.0)(typescript@5.7.2)': dependencies: '@eslint-community/regexpp': 4.12.1 - '@typescript-eslint/parser': 8.15.0(eslint@9.15.0)(typescript@5.7.2) - '@typescript-eslint/scope-manager': 8.15.0 - '@typescript-eslint/type-utils': 8.15.0(eslint@9.15.0)(typescript@5.7.2) - '@typescript-eslint/utils': 8.15.0(eslint@9.15.0)(typescript@5.7.2) - '@typescript-eslint/visitor-keys': 8.15.0 - eslint: 9.15.0 + '@typescript-eslint/parser': 8.16.0(eslint@9.16.0)(typescript@5.7.2) + '@typescript-eslint/scope-manager': 8.16.0 + '@typescript-eslint/type-utils': 8.16.0(eslint@9.16.0)(typescript@5.7.2) + '@typescript-eslint/utils': 8.16.0(eslint@9.16.0)(typescript@5.7.2) + '@typescript-eslint/visitor-keys': 8.16.0 + eslint: 9.16.0 graphemer: 1.4.0 ignore: 5.3.2 natural-compare: 1.4.0 @@ -2763,42 +2763,42 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.15.0(eslint@9.15.0)(typescript@5.7.2)': + '@typescript-eslint/parser@8.16.0(eslint@9.16.0)(typescript@5.7.2)': dependencies: - '@typescript-eslint/scope-manager': 8.15.0 - '@typescript-eslint/types': 8.15.0 - '@typescript-eslint/typescript-estree': 8.15.0(typescript@5.7.2) - '@typescript-eslint/visitor-keys': 8.15.0 + '@typescript-eslint/scope-manager': 8.16.0 + '@typescript-eslint/types': 8.16.0 + '@typescript-eslint/typescript-estree': 8.16.0(typescript@5.7.2) + '@typescript-eslint/visitor-keys': 8.16.0 debug: 4.3.6(supports-color@8.1.1) - eslint: 9.15.0 + eslint: 9.16.0 optionalDependencies: typescript: 5.7.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@8.15.0': + '@typescript-eslint/scope-manager@8.16.0': dependencies: - '@typescript-eslint/types': 8.15.0 - '@typescript-eslint/visitor-keys': 8.15.0 + '@typescript-eslint/types': 8.16.0 + '@typescript-eslint/visitor-keys': 8.16.0 - '@typescript-eslint/type-utils@8.15.0(eslint@9.15.0)(typescript@5.7.2)': + '@typescript-eslint/type-utils@8.16.0(eslint@9.16.0)(typescript@5.7.2)': dependencies: - '@typescript-eslint/typescript-estree': 8.15.0(typescript@5.7.2) - '@typescript-eslint/utils': 8.15.0(eslint@9.15.0)(typescript@5.7.2) + '@typescript-eslint/typescript-estree': 8.16.0(typescript@5.7.2) + '@typescript-eslint/utils': 8.16.0(eslint@9.16.0)(typescript@5.7.2) debug: 4.3.6(supports-color@8.1.1) - eslint: 9.15.0 + eslint: 9.16.0 ts-api-utils: 1.3.0(typescript@5.7.2) optionalDependencies: typescript: 5.7.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/types@8.15.0': {} + '@typescript-eslint/types@8.16.0': {} - '@typescript-eslint/typescript-estree@8.15.0(typescript@5.7.2)': + '@typescript-eslint/typescript-estree@8.16.0(typescript@5.7.2)': dependencies: - '@typescript-eslint/types': 8.15.0 - '@typescript-eslint/visitor-keys': 8.15.0 + '@typescript-eslint/types': 8.16.0 + '@typescript-eslint/visitor-keys': 8.16.0 debug: 4.3.6(supports-color@8.1.1) fast-glob: 3.3.2 is-glob: 4.0.3 @@ -2810,21 +2810,21 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.15.0(eslint@9.15.0)(typescript@5.7.2)': + '@typescript-eslint/utils@8.16.0(eslint@9.16.0)(typescript@5.7.2)': dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.15.0) - '@typescript-eslint/scope-manager': 8.15.0 - '@typescript-eslint/types': 8.15.0 - '@typescript-eslint/typescript-estree': 8.15.0(typescript@5.7.2) - eslint: 9.15.0 + '@eslint-community/eslint-utils': 4.4.0(eslint@9.16.0) + '@typescript-eslint/scope-manager': 8.16.0 + '@typescript-eslint/types': 8.16.0 + '@typescript-eslint/typescript-estree': 8.16.0(typescript@5.7.2) + eslint: 9.16.0 optionalDependencies: typescript: 5.7.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/visitor-keys@8.15.0': + '@typescript-eslint/visitor-keys@8.16.0': dependencies: - '@typescript-eslint/types': 8.15.0 + '@typescript-eslint/types': 8.16.0 eslint-visitor-keys: 4.2.0 '@umbrelladocs/linkspector@0.3.13(typescript@5.7.2)': @@ -3382,9 +3382,9 @@ snapshots: optionalDependencies: source-map: 0.6.1 - eslint-config-prettier@9.1.0(eslint@9.15.0): + eslint-config-prettier@9.1.0(eslint@9.16.0): dependencies: - eslint: 9.15.0 + eslint: 9.16.0 eslint-plugin-no-only-tests@3.3.0: {} @@ -3397,14 +3397,14 @@ snapshots: eslint-visitor-keys@4.2.0: {} - eslint@9.15.0: + eslint@9.16.0: dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.15.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.16.0) '@eslint-community/regexpp': 4.12.1 '@eslint/config-array': 0.19.0 '@eslint/core': 0.9.0 '@eslint/eslintrc': 3.2.0 - '@eslint/js': 9.15.0 + '@eslint/js': 9.16.0 '@eslint/plugin-kit': 0.2.3 '@humanfs/node': 0.16.6 '@humanwhocodes/module-importer': 1.0.1 @@ -4470,19 +4470,19 @@ snapshots: prelude-ls@1.2.1: {} - prettier-plugin-organize-imports@4.1.0(prettier@3.3.3)(typescript@5.7.2): + prettier-plugin-organize-imports@4.1.0(prettier@3.4.1)(typescript@5.7.2): dependencies: - prettier: 3.3.3 + prettier: 3.4.1 typescript: 5.7.2 - prettier-plugin-packagejson@2.5.5(prettier@3.3.3): + prettier-plugin-packagejson@2.5.6(prettier@3.4.1): dependencies: - sort-package-json: 2.11.0 + sort-package-json: 2.12.0 synckit: 0.9.2 optionalDependencies: - prettier: 3.3.3 + prettier: 3.4.1 - prettier@3.3.3: {} + prettier@3.4.1: {} pretty-bytes@5.6.0: {} @@ -4729,7 +4729,7 @@ snapshots: sort-object-keys@1.1.3: {} - sort-package-json@2.11.0: + sort-package-json@2.12.0: dependencies: detect-indent: 7.0.1 detect-newline: 4.0.1 @@ -4904,7 +4904,7 @@ snapshots: type-fest@0.21.3: {} - type-fest@4.27.0: {} + type-fest@4.29.0: {} type-is@1.6.18: dependencies: @@ -4922,7 +4922,7 @@ snapshots: buffer: 5.7.1 through: 2.3.8 - undici-types@6.19.8: {} + undici-types@6.20.0: {} unicorn-magic@0.1.0: {} From 3de2af6fd8765fb41380f9c35220d400b48e591d Mon Sep 17 00:00:00 2001 From: Mika Vilpas Date: Sat, 30 Nov 2024 15:13:01 +0200 Subject: [PATCH 2/4] refactor(tests): reduce fake type errors in tests I recently added the types of luassert to my neovim config. It looks like they disallow many values that actually exist at runtime, so they are not very good. I will remove them for now anyway, since it's easy. https://github.com/mikavilpas/dotfiles/blob/b9f67f74ff4075d78fada7ec064e6234a02a2b71/.config/nvim/lua/plugins/luadev.lua?plain=1#L4-L5 --- .../test-environment/.config/nvim/init.lua | 1 + lua/yazi/utils.lua | 4 +++ spec/yazi/command_spec.lua | 6 ++-- spec/yazi/dir_of_spec.lua | 8 +++--- spec/yazi/grug_far_spec.lua | 2 +- spec/yazi/keybinding_helpers_spec.lua | 26 ++++++++--------- spec/yazi/move_spec.lua | 10 +++---- spec/yazi/open_multiple_files_spec.lua | 12 ++++---- spec/yazi/plugin_spec.lua | 4 +-- spec/yazi/rename_spec.lua | 10 +++---- spec/yazi/selected_files_spec.lua | 16 +++++------ spec/yazi/ya_process_spec.lua | 24 ++++++++-------- spec/yazi/yazi_spec.lua | 28 +++++++++---------- spec/yazi/yazi_visible_buffer_spec.lua | 6 ++-- vim.toml | 6 ++-- 15 files changed, 84 insertions(+), 79 deletions(-) diff --git a/integration-tests/test-environment/.config/nvim/init.lua b/integration-tests/test-environment/.config/nvim/init.lua index 76aaa7e1..e731c2d5 100644 --- a/integration-tests/test-environment/.config/nvim/init.lua +++ b/integration-tests/test-environment/.config/nvim/init.lua @@ -39,6 +39,7 @@ vim.env.YAZI_NVIM_LOG_PATH = vim.fn.fnamemodify(vim.uv.os_environ().HOME .. "/../../.repro/yazi.log", ":p") -- install the following plugins +---@module "lazy" ---@type LazySpec local plugins = { { diff --git a/lua/yazi/utils.lua b/lua/yazi/utils.lua index 724d7e11..8217d035 100644 --- a/lua/yazi/utils.lua +++ b/lua/yazi/utils.lua @@ -9,6 +9,10 @@ local M = {} ---@return string function M.relative_path(config, current_file_dir, selected_file) local command = config.integrations.resolve_relative_path_application + assert( + command ~= nil, + "resolve_relative_path_application must be set. Please report this as a bug." + ) if vim.fn.executable(command) == 0 then local msg = string.format( diff --git a/spec/yazi/command_spec.lua b/spec/yazi/command_spec.lua index ac794622..bdba3aa1 100644 --- a/spec/yazi/command_spec.lua +++ b/spec/yazi/command_spec.lua @@ -27,20 +27,20 @@ describe("the Yazi commands", function() commands.create_yazi_commands() vim.cmd(":Yazi") - assert.stub(yazi_stub).was_called_with() + assert.stub(yazi_stub).called_with() end) it("creates the `:Yazi cwd` command", function() commands.create_yazi_commands() vim.cmd(":Yazi cwd") - assert.stub(yazi_stub).was_called_with(nil, "/tmp") + assert.stub(yazi_stub).called_with(nil, "/tmp") end) it("creates the `:Yazi toggle` command", function() commands.create_yazi_commands() vim.cmd(":Yazi toggle") - assert.stub(yazi_toggle_stub).was_called_with() + assert.stub(yazi_toggle_stub).called_with() end) end) diff --git a/spec/yazi/dir_of_spec.lua b/spec/yazi/dir_of_spec.lua index daf04e31..fa13a6df 100644 --- a/spec/yazi/dir_of_spec.lua +++ b/spec/yazi/dir_of_spec.lua @@ -7,14 +7,14 @@ describe("dir_of helper function", function() function() it("can detect the dir of a file", function() local d = utils.dir_of("/my-tmp/file1") - assert.is_equal("/my-tmp", d.filename) + assert.equal("/my-tmp", d.filename) end) it("can detect the dir of a directory", function() -- I think it just thinks directories are files because it cannot know -- better. But this is still a good default. local d = utils.dir_of("/my-tmp/dir1") - assert.is_equal("/my-tmp", d.filename) + assert.equal("/my-tmp", d.filename) end) end ) @@ -38,7 +38,7 @@ describe("dir_of helper function", function() it("can get the directory of a file", function() local file = vim.fs.joinpath(base_dir, "abc.txt") local d = utils.dir_of(file) - assert.is_equal(base_dir, d.filename) + assert.equal(base_dir, d.filename) end) it("can get the directory of a directory", function() @@ -46,7 +46,7 @@ describe("dir_of helper function", function() vim.fn.mkdir(dir) local d = utils.dir_of(dir) - assert.is_equal(base_dir, d.filename) + assert.equal(base_dir, d.filename) end) end) end) diff --git a/spec/yazi/grug_far_spec.lua b/spec/yazi/grug_far_spec.lua index 8d5f0aab..0f392113 100644 --- a/spec/yazi/grug_far_spec.lua +++ b/spec/yazi/grug_far_spec.lua @@ -18,7 +18,7 @@ describe("the grug-far integration (search and replace)", function() config.default().integrations.replace_in_directory(tmp_path) - assert.spy(mock_grug_far.open).was_called_with({ + assert.spy(mock_grug_far.open).called_with({ prefills = { paths = "/tmp/folder\\ with\\ spaces", }, diff --git a/spec/yazi/keybinding_helpers_spec.lua b/spec/yazi/keybinding_helpers_spec.lua index 1574442c..c334e9fb 100644 --- a/spec/yazi/keybinding_helpers_spec.lua +++ b/spec/yazi/keybinding_helpers_spec.lua @@ -29,7 +29,7 @@ describe("keybinding_helpers", function() keybinding_helpers.grep_in_directory(config, "/tmp/file") - assert.stub(s).was_called_with("/tmp") + assert.stub(s).called_with("/tmp") end) it("should grep in the directory when a directory is passed", function() @@ -38,7 +38,7 @@ describe("keybinding_helpers", function() keybinding_helpers.grep_in_directory(config, "/tmp") - assert.stub(s).was_called_with("/") + assert.stub(s).called_with("/") end) it("should not crash if the integration is disabled", function() @@ -63,7 +63,7 @@ describe("keybinding_helpers", function() { "/tmp/file1", "/tmp/file2" } ) - assert.equals(2, #results) + assert.equal(2, #results) assert.are.same( { "/tmp/file1", "/tmp/file2" }, vim @@ -86,8 +86,8 @@ describe("keybinding_helpers", function() keybinding_helpers.replace_in_directory(config, "/tmp/file") - assert.stub(stub_replace).was_called_with(match.is_truthy()) - assert.equals("/tmp", stub_replace.calls[1].vals[1].filename) + assert.stub(stub_replace).called_with(match.is_truthy()) + assert.equal("/tmp", stub_replace.calls[1].vals[1].filename) end ) @@ -103,8 +103,8 @@ describe("keybinding_helpers", function() keybinding_helpers.replace_in_directory(config, "/tmp") - assert.stub(stub_replace).was_called_with(match.is_truthy()) - assert.equals("/", stub_replace.calls[1].vals[1].filename) + assert.stub(stub_replace).called_with(match.is_truthy()) + assert.equal("/", stub_replace.calls[1].vals[1].filename) end ) end) @@ -124,7 +124,7 @@ describe("keybinding_helpers", function() { "/tmp/file1", "/tmp/file2" } ) - assert.equals(2, #results) + assert.equal(2, #results) local paths = vim .iter(results) @@ -152,9 +152,9 @@ describe("keybinding_helpers", function() assert .stub(vim_cmd_stub) - .was_called_with({ cmd = "cd", args = { "/tmp" } }) + .called_with({ cmd = "cd", args = { "/tmp" } }) - assert.stub(vim_notify_stub).was_called_with('cwd changed to "/tmp"') + assert.stub(vim_notify_stub).called_with('cwd changed to "/tmp"') end ) @@ -170,8 +170,8 @@ describe("keybinding_helpers", function() assert .stub(vim_cmd_stub) - .was_called_with({ cmd = "cd", args = { "/tmp" } }) - assert.stub(vim_notify_stub).was_called_with('cwd changed to "/tmp"') + .called_with({ cmd = "cd", args = { "/tmp" } }) + assert.stub(vim_notify_stub).called_with('cwd changed to "/tmp"') end) it( @@ -187,7 +187,7 @@ describe("keybinding_helpers", function() }, }) - assert.stub(vim_fn_stub).was_called_with() + assert.stub(vim_fn_stub).called_with() assert.stub(vim_cmd_stub).was_not_called() assert.stub(vim_notify_stub).was_not_called() end diff --git a/spec/yazi/move_spec.lua b/spec/yazi/move_spec.lua index cad59d92..02e411fa 100644 --- a/spec/yazi/move_spec.lua +++ b/spec/yazi/move_spec.lua @@ -23,10 +23,10 @@ describe("get_buffers_that_need_renaming_after_yazi_exited", function() move_event ) - assert.is_equal(vim.tbl_count(instructions), 1) + assert.equal(vim.tbl_count(instructions), 1) local result1 = instructions[1] - assert.is_equal("/my-tmp/file2", result1.path.filename) + assert.equal("/my-tmp/file2", result1.path.filename) assert.is_number(result1.bufnr) end) @@ -47,9 +47,9 @@ describe("get_buffers_that_need_renaming_after_yazi_exited", function() move_event ) - assert.is_equal(vim.tbl_count(instructions), 1) + assert.equal(vim.tbl_count(instructions), 1) local result = instructions[1] - assert.is_equal("/my-tmp/dir2/file", result.path.filename) + assert.equal("/my-tmp/dir2/file", result.path.filename) end ) @@ -68,6 +68,6 @@ describe("get_buffers_that_need_renaming_after_yazi_exited", function() move_event ) - assert.is_equal(vim.tbl_count(instructions), 0) + assert.equal(vim.tbl_count(instructions), 0) end) end) diff --git a/spec/yazi/open_multiple_files_spec.lua b/spec/yazi/open_multiple_files_spec.lua index 86ba6b0b..99a25d4a 100644 --- a/spec/yazi/open_multiple_files_spec.lua +++ b/spec/yazi/open_multiple_files_spec.lua @@ -20,9 +20,9 @@ describe("the default configuration", function() local buffers = vim.api.nvim_list_bufs() - assert.equals(2, #buffers) - assert.equals("/abc/test-file.txt", vim.api.nvim_buf_get_name(buffers[1])) - assert.equals("/abc/test-file2.txt", vim.api.nvim_buf_get_name(buffers[2])) + assert.equal(2, #buffers) + assert.equal("/abc/test-file.txt", vim.api.nvim_buf_get_name(buffers[1])) + assert.equal("/abc/test-file2.txt", vim.api.nvim_buf_get_name(buffers[2])) end) it("can display multiple files in the quickfix list", function() @@ -41,8 +41,8 @@ describe("the default configuration", function() local quickfix_list = vim.fn.getqflist() - assert.equals(2, #quickfix_list) - assert.equals("/abc/test-$@file.txt", quickfix_list[1].text) - assert.equals("/abc/test-file2.txt", quickfix_list[2].text) + assert.equal(2, #quickfix_list) + assert.equal("/abc/test-$@file.txt", quickfix_list[1].text) + assert.equal("/abc/test-file2.txt", quickfix_list[2].text) end) end) diff --git a/spec/yazi/plugin_spec.lua b/spec/yazi/plugin_spec.lua index c6d76c0d..13f0bd77 100644 --- a/spec/yazi/plugin_spec.lua +++ b/spec/yazi/plugin_spec.lua @@ -78,8 +78,8 @@ describe("installing a plugin", function() name = "test-plugin-2", }, { yazi_dir = yazi_dir }) - assert.is_equal(result.error, "source directory does not exist") - assert.is_equal(result.from, plugin_dir) + assert.equal(result.error, "source directory does not exist") + assert.equal(result.from, plugin_dir) end) it("can install a plugin from a monorepo subdirectory", function() diff --git a/spec/yazi/rename_spec.lua b/spec/yazi/rename_spec.lua index 2ec92c75..20dd6000 100644 --- a/spec/yazi/rename_spec.lua +++ b/spec/yazi/rename_spec.lua @@ -24,10 +24,10 @@ describe("get_buffers_that_need_renaming_after_yazi_exited", function() rename_event ) - assert.is_equal(vim.tbl_count(rename_instructions), 1) + assert.equal(vim.tbl_count(rename_instructions), 1) local result1 = rename_instructions[1] - assert.is_equal("/my-tmp/file2", result1.path.filename) + assert.equal("/my-tmp/file2", result1.path.filename) assert.is_number(result1.bufnr) end) @@ -48,9 +48,9 @@ describe("get_buffers_that_need_renaming_after_yazi_exited", function() rename_event ) - assert.is_equal(vim.tbl_count(rename_instructions), 1) + assert.equal(vim.tbl_count(rename_instructions), 1) local result = rename_instructions[1] - assert.is_equal("/my-tmp/dir2/file", result.path.filename) + assert.equal("/my-tmp/dir2/file", result.path.filename) end ) @@ -69,7 +69,7 @@ describe("get_buffers_that_need_renaming_after_yazi_exited", function() rename_event ) - assert.is_equal(vim.tbl_count(rename_instructions), 0) + assert.equal(vim.tbl_count(rename_instructions), 0) end) end) diff --git a/spec/yazi/selected_files_spec.lua b/spec/yazi/selected_files_spec.lua index 90627ea8..77f8b602 100644 --- a/spec/yazi/selected_files_spec.lua +++ b/spec/yazi/selected_files_spec.lua @@ -13,20 +13,20 @@ describe("choosing the correct files when starting yazi", function() local result = utils.selected_file_path("/my-tmp/file1") - assert.is_equal("/my-tmp/file1", result.filename) + assert.equal("/my-tmp/file1", result.filename) end) it("when no file is loaded, returns the current directory", function() local result = utils.selected_file_path() - assert.is_equal(result.filename, vim.fn.getcwd()) + assert.equal(result.filename, vim.fn.getcwd()) end) end) describe(" selected_files", function() it("when no file is loaded, returns the current directory", function() local result = utils.selected_file_paths() - assert.is_equal(result[1].filename, vim.fn.getcwd()) + assert.equal(result[1].filename, vim.fn.getcwd()) end) it("when given a file, returns that file", function() @@ -34,8 +34,8 @@ describe("choosing the correct files when starting yazi", function() local result = utils.selected_file_paths("/my-tmp/file1") - assert.is_equal("/my-tmp/file1", result[1].filename) - assert.is_equal(1, #result) + assert.equal("/my-tmp/file1", result[1].filename) + assert.equal(1, #result) end) it( @@ -46,10 +46,10 @@ describe("choosing the correct files when starting yazi", function() local result = utils.selected_file_paths("/my-tmp/file1") - assert.is_equal(#result, 2) + assert.equal(#result, 2) - assert.is_equal("/my-tmp/file1", result[1].filename) - assert.is_equal("/my-tmp/file2", result[2].filename) + assert.equal("/my-tmp/file1", result[1].filename) + assert.equal("/my-tmp/file2", result[2].filename) end ) end) diff --git a/spec/yazi/ya_process_spec.lua b/spec/yazi/ya_process_spec.lua index 0a5b3dab..1f49b341 100644 --- a/spec/yazi/ya_process_spec.lua +++ b/spec/yazi/ya_process_spec.lua @@ -91,7 +91,7 @@ describe("process_events()", function() id = "cd_123", url = "/tmp", } --[[@as YaziChangeDirectoryEvent]], - }) + }, {}) assert.are.same("/tmp", ya.cwd) end) @@ -111,7 +111,7 @@ describe("process_events()", function() id = "cd_123", url = "/tmp/directory", } --[[@as YaziChangeDirectoryEvent]], - }) + }, {}) assert.are.same("/tmp/directory", ya.cwd) end) @@ -142,7 +142,7 @@ describe("process_events()", function() }, } - local event_callback = spy.new() + local event_callback = spy.new(function() end) vim.api.nvim_create_autocmd("User", { pattern = "YaziRenamedOrMoved", callback = function(...) @@ -150,7 +150,7 @@ describe("process_events()", function() end, }) - ya:process_events(events) + ya:process_events(events, {}) vim.wait(2000, function() return #event_callback.calls > 0 end) @@ -186,7 +186,7 @@ describe("process_events()", function() }, } - local event_callback = spy.new() + local event_callback = spy.new(function() end) vim.api.nvim_create_autocmd("User", { pattern = "YaziRenamedOrMoved", callback = function(...) @@ -194,7 +194,7 @@ describe("process_events()", function() end, }) - ya:process_events(events) + ya:process_events(events, {}) vim.wait(2000, function() return #event_callback.calls > 0 end) @@ -228,7 +228,7 @@ describe("process_events()", function() }, } - local event_callback = spy.new() + local event_callback = spy.new(function() end) vim.api.nvim_create_autocmd("User", { pattern = "YaziRenamedOrMoved", callback = function(...) @@ -236,7 +236,7 @@ describe("process_events()", function() end, }) - ya:process_events(events) + ya:process_events(events, {}) vim.wait(2000, function() return #event_callback.calls > 0 end) @@ -263,7 +263,7 @@ describe("opening the yazi in a terminal", function() local snapshot before_each(function() - snapshot = assert.snapshot() + snapshot = assert:snapshot() end) after_each(function() @@ -274,11 +274,11 @@ describe("opening the yazi in a terminal", function() "sets the NVIM_CWD environment variable to the current working directory", function() -- selene: allow(incorrect_standard_library_use) - os.remove = spy.new() + os.remove = spy.new(function() end) vim.uv.cwd = spy.new(function() return "/tmp/fakedir" end) - local termopen_spy = spy.new() + local termopen_spy = spy.new(function() end) vim.fn.termopen = termopen_spy require("yazi.process.yazi_process"):start( @@ -292,7 +292,7 @@ describe("opening the yazi in a terminal", function() assert(termopen_spy.calls[1].vals[2].env) local env = termopen_spy.calls[1].vals[2].env - assert.equals(env.NVIM_CWD, "/tmp/fakedir") + assert.equal(env.NVIM_CWD, "/tmp/fakedir") end ) end) diff --git a/spec/yazi/yazi_spec.lua b/spec/yazi/yazi_spec.lua index ade2a4c3..eee6c621 100644 --- a/spec/yazi/yazi_spec.lua +++ b/spec/yazi/yazi_spec.lua @@ -32,7 +32,7 @@ describe("opening a file", function() ---@type Path[] local actual_files = call.vals[3] - assert.is_equal(type(actual_files), "table") + assert.equal(type(actual_files), "table") local file_names = vim.tbl_map(function(file) return file.filename @@ -80,8 +80,8 @@ describe("opening a file", function() ---@param state YaziClosedState ---@diagnostic disable-next-line: unused-local local spy_hook = spy.new(function(chosen_file, _config, state) - assert.equals(nil, chosen_file) - assert.equals("/abc", state.last_directory.filename) + assert.equal(nil, chosen_file) + assert.equal("/abc", state.last_directory.filename) end) plugin.yazi({ @@ -95,7 +95,7 @@ describe("opening a file", function() assert .spy(spy_hook) - .was_called_with(nil, match.is_table(), match.is_table()) + .called_with(nil, match.is_table(), match.is_table()) end ) @@ -125,9 +125,9 @@ describe("opening a file", function() ---@param state YaziClosedState ---@diagnostic disable-next-line: unused-local function(chosen_file, _config, state) - assert.equals(target_file, chosen_file) - assert.equals("/tmp", state.last_directory.filename) - assert.equals( + assert.equal(target_file, chosen_file) + assert.equal("/tmp", state.last_directory.filename) + assert.equal( "/tmp", plenary_path:new(target_file):parent().filename ) @@ -145,13 +145,13 @@ describe("opening a file", function() assert .spy(spy_yazi_closed_successfully) - .was_called_with(target_file, match.is_table(), match.is_table()) + .called_with(target_file, match.is_table(), match.is_table()) end ) end) it("calls the yazi_opened hook when yazi is opened", function() - local spy_yazi_opened_hook = spy.new() + local spy_yazi_opened_hook = spy.new(function() end) vim.api.nvim_command("edit /abc/yazi_opened_hook_file.txt") @@ -165,7 +165,7 @@ describe("opening a file", function() assert .spy(spy_yazi_opened_hook) - .was_called_with("/abc/yazi_opened_hook_file.txt", match.is_number(), match.is_table()) + .called_with("/abc/yazi_opened_hook_file.txt", match.is_number(), match.is_table()) end) it("calls the open_file_function to open the selected file", function() @@ -173,7 +173,7 @@ describe("opening a file", function() fake_yazi_process.setup_created_instances_to_instantly_exit({ selected_files = { target_file }, }) - local spy_open_file_function = spy.new() + local spy_open_file_function = spy.new(function() end) vim.api.nvim_command("edit " .. target_file) @@ -185,7 +185,7 @@ describe("opening a file", function() assert .spy(spy_open_file_function) - .was_called_with(target_file, match.is_table(), match.is_table()) + .called_with(target_file, match.is_table(), match.is_table()) end) end) @@ -198,7 +198,7 @@ describe("opening multiple files", function() selected_files = { target_file_1, target_file_2 }, }) - local spy_open_multiple_files = spy.new() + local spy_open_multiple_files = spy.new(function() end) plugin.yazi({ ---@diagnostic disable-next-line: missing-fields hooks = { @@ -208,7 +208,7 @@ describe("opening multiple files", function() chosen_file_path = "/tmp/yazi_filechosen-123", }) - assert.spy(spy_open_multiple_files).was_called_with({ + assert.spy(spy_open_multiple_files).called_with({ target_file_1, target_file_2, }, match.is_table(), match.is_table()) diff --git a/spec/yazi/yazi_visible_buffer_spec.lua b/spec/yazi/yazi_visible_buffer_spec.lua index 2b58d34a..8579db15 100644 --- a/spec/yazi/yazi_visible_buffer_spec.lua +++ b/spec/yazi/yazi_visible_buffer_spec.lua @@ -14,7 +14,7 @@ describe("YaziVisibleBuffer", function() local visible_open_buffers = utils.get_visible_open_buffers() - assert.equals(1, #visible_open_buffers) + assert.equal(1, #visible_open_buffers) end) it("is not found for a buffer that's not visible", function() @@ -23,10 +23,10 @@ describe("YaziVisibleBuffer", function() local visible_open_buffers = utils.get_visible_open_buffers() - assert.equals(1, #visible_open_buffers) + assert.equal(1, #visible_open_buffers) local visible_open_buffer = visible_open_buffers[1] - assert.equals( + assert.equal( "file1", visible_open_buffer.renameable_buffer.path.filename:match("file1") ) diff --git a/vim.toml b/vim.toml index 77b3b7fb..6621793c 100644 --- a/vim.toml +++ b/vim.toml @@ -29,11 +29,11 @@ any = true [assert.has_error] any = true -[[assert.equals.args]] +[[assert.equal.args]] type = "any" -[[assert.equals.args]] +[[assert.equal.args]] type = "any" -[[assert.equals.args]] +[[assert.equal.args]] type = "any" required = false From 8add326ca057af6b0af45ddcdf74d333db17a255 Mon Sep 17 00:00:00 2001 From: Mika Vilpas Date: Sat, 30 Nov 2024 15:59:59 +0200 Subject: [PATCH 3/4] ci: update the nightly version of yazi to the latest nightly --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6d70d6a9..8f80ca9a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,8 +37,8 @@ jobs: crate: yazi-fm git: https://github.com/sxyazi/yazi commit: - # https://github.com/sxyazi/yazi/commit/c6687237e17673bfcd9a75f12730ea078faa0262 - c6687237e17673bfcd9a75f12730ea078faa0262 + # https://github.com/sxyazi/yazi/commit/d72f90356b98 + d72f90356b98 - name: Compile and install yazi from source uses: baptiste0928/cargo-install@v3.1.1 @@ -47,8 +47,8 @@ jobs: crate: yazi-cli git: https://github.com/sxyazi/yazi commit: - # https://github.com/sxyazi/yazi/commit/c6687237e17673bfcd9a75f12730ea078faa0262 - c6687237e17673bfcd9a75f12730ea078faa0262 + # https://github.com/sxyazi/yazi/commit/d72f90356b98 + d72f90356b98 - name: Run tests uses: nvim-neorocks/nvim-busted-action@v1.1.0 From 64126ebc670b9bb0acc529c2fa9ae12a9d3bf4e1 Mon Sep 17 00:00:00 2001 From: Mika Vilpas Date: Sat, 30 Nov 2024 15:23:57 +0200 Subject: [PATCH 4/4] ci: preinstall neovim plugins before integration-tests Previously this caused the first 1-2 tests to fail, although this was always caught by retries. It's not very clean to have these failures, so let's be clear and install all neovim plugins beforehand. --- .github/workflows/test.yml | 4 ++++ integration-tests/package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8f80ca9a..6516c9d2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -69,6 +69,10 @@ jobs: runTests: false # https://github.com/cypress-io/github-action/blob/bff0ae58f02476fbc4b13229bcaac2767f645b3e/README.md#pnpm-workspaces + - name: Preinstall neovim plugins + run: pnpm tui neovim exec "Lazy! sync" + working-directory: integration-tests + - name: Cypress test uses: cypress-io/github-action@v6 with: diff --git a/integration-tests/package.json b/integration-tests/package.json index c1802588..2b703529 100644 --- a/integration-tests/package.json +++ b/integration-tests/package.json @@ -15,7 +15,7 @@ "zod": "3.23.8" }, "devDependencies": { - "@tui-sandbox/library": "7.2.1", + "@tui-sandbox/library": "7.3.0", "@types/node": "22.10.1", "@types/tinycolor2": "1.4.6", "@typescript-eslint/eslint-plugin": "8.16.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 016bd79f..4135d0c5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -37,8 +37,8 @@ importers: version: 3.23.8 devDependencies: '@tui-sandbox/library': - specifier: 7.2.1 - version: 7.2.1(cypress@13.16.0)(prettier@3.4.1)(type-fest@4.29.0)(typescript@5.7.2) + specifier: 7.3.0 + version: 7.3.0(cypress@13.16.0)(prettier@3.4.1)(type-fest@4.29.0)(typescript@5.7.2) '@types/node': specifier: 22.10.1 version: 22.10.1 @@ -375,8 +375,8 @@ packages: peerDependencies: typescript: '>=5.6.2' - '@tui-sandbox/library@7.2.1': - resolution: {integrity: sha512-Oot33wsISonReNH0vcsN1u6kJSqpTG8ogzl3fLol6qRulGXRWlvfnrUxOW5HQFXla8oypObsel/aNP0X2EpBhg==} + '@tui-sandbox/library@7.3.0': + resolution: {integrity: sha512-RFwAPoea0X9pMAFxl91weSK17RJ05qg4wW0LQuEJcy4u8TBUeWjUvUIGYe/K97RrztGaR8+U53KRFUM+tiTJMQ==} hasBin: true peerDependencies: cypress: ^13 @@ -2687,7 +2687,7 @@ snapshots: dependencies: typescript: 5.7.2 - '@tui-sandbox/library@7.2.1(cypress@13.16.0)(prettier@3.4.1)(type-fest@4.29.0)(typescript@5.7.2)': + '@tui-sandbox/library@7.3.0(cypress@13.16.0)(prettier@3.4.1)(type-fest@4.29.0)(typescript@5.7.2)': dependencies: '@catppuccin/palette': 1.7.1 '@trpc/client': 11.0.0-rc.648(@trpc/server@11.0.0-rc.648(typescript@5.7.2))(typescript@5.7.2)