Skip to content

Commit

Permalink
fix: debump builders to 0.15.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@favna
favna committed Jul 29, 2022
1 parent f47e6f6 commit 747be01
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 48 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"postpack": "pinst --enable"
},
"dependencies": {
"@discordjs/builders": "^0.16.0",
"@discordjs/builders": "^0.15.0",
"@sapphire/discord-utilities": "^2.11.5",
"@sapphire/discord.js-utilities": "^4.11.3",
"@sapphire/pieces": "^3.3.5",
Expand Down
22 changes: 13 additions & 9 deletions src/lib/utils/application-commands/computeDifferences.ts
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { cast } from '@sapphire/utilities';
import {
APIApplicationCommandIntegerOption,
APIApplicationCommandNumberOption,
Expand Down Expand Up @@ -647,55 +648,58 @@ function* reportOptionDifferences({

if (hasMinMaxLengthSupport(option)) {
// Check min and max_value
const existingCasted = existingOption as APIApplicationCommandStringOption;
const existingCasted = cast<APIApplicationCommandStringOption & { min_length?: number; max_length?: number }>(existingOption);

// TODO (Framework#485): With discord-api-types 0.36.x this cast will no longer be necessary
const optionCasted = cast<APIApplicationCommandStringOption & { min_length?: number; max_length?: number }>(option);

// 0. No min_length and now we have min_length
if (existingCasted.min_length === undefined && option.min_length !== undefined) {
if (existingCasted.min_length === undefined && optionCasted.min_length !== undefined) {
yield {
key: `${keyPath(currentIndex)}.min_length`,
expected: 'min_length present',
original: 'no min_length present'
};
}
// 1. Have min_length and now we don't
else if (existingCasted.min_length !== undefined && option.min_length === undefined) {
else if (existingCasted.min_length !== undefined && optionCasted.min_length === undefined) {
yield {
key: `${keyPath(currentIndex)}.min_length`,
expected: 'no min_length present',
original: 'min_length present'
};
}
// 2. Equality check
else if (existingCasted.min_length !== option.min_length) {
else if (existingCasted.min_length !== optionCasted.min_length) {
yield {
key: `${keyPath(currentIndex)}.min_length`,
original: String(existingCasted.min_length),
expected: String(option.min_length)
expected: String(optionCasted.min_length)
};
}

// 0. No max_length and now we have max_length
if (existingCasted.max_length === undefined && option.max_length !== undefined) {
if (existingCasted.max_length === undefined && optionCasted.max_length !== undefined) {
yield {
key: `${keyPath(currentIndex)}.max_length`,
expected: 'max_length present',
original: 'no max_length present'
};
}
// 1. Have max_length and now we don't
else if (existingCasted.max_length !== undefined && option.max_length === undefined) {
else if (existingCasted.max_length !== undefined && optionCasted.max_length === undefined) {
yield {
key: `${keyPath(currentIndex)}.max_length`,
expected: 'no max_length present',
original: 'max_length present'
};
}
// 2. Equality check
else if (existingCasted.max_length !== option.max_length) {
else if (existingCasted.max_length !== optionCasted.max_length) {
yield {
key: `${keyPath(currentIndex)}.max_length`,
original: String(existingCasted.max_length),
expected: String(option.max_length)
expected: String(optionCasted.max_length)
};
}
}
Expand Down
97 changes: 59 additions & 38 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,20 @@ __metadata:
languageName: node
linkType: hard

"@discordjs/builders@npm:^0.15.0":
version: 0.15.0
resolution: "@discordjs/builders@npm:0.15.0"
dependencies:
"@sapphire/shapeshift": ^3.1.0
"@sindresorhus/is": ^4.6.0
discord-api-types: ^0.33.3
fast-deep-equal: ^3.1.3
ts-mixer: ^6.0.1
tslib: ^2.4.0
checksum: 1a8a4ffe048243ebb9fbbc76a113e4994c68904a5b3d256a6b10c0123f1d0fb58b45809d134ba993293fb2190c9f3506663ddfb5068a86ec6b9c53b5db61f6a6
languageName: node
linkType: hard

"@discordjs/builders@npm:^0.16.0":
version: 0.16.0
resolution: "@discordjs/builders@npm:0.16.0"
Expand All @@ -608,9 +622,9 @@ __metadata:
linkType: hard

"@discordjs/collection@npm:^1.0.0":
version: 1.0.0
resolution: "@discordjs/collection@npm:1.0.0"
checksum: d8eafd35e782a6a2ee83a22c31679958bc827fce8cd5ffc7e5942cf681c96fd9543334b48c743ecda45179fcefa8d7be7a13f771d7f14effaec8a8ca25077031
version: 1.0.1
resolution: "@discordjs/collection@npm:1.0.1"
checksum: 6477ae9870f3c069b190f673a6b34467930b409a6d763f1b0d4f6169051b8499d03de7b0e7e4c3697222845aea6d94283573ad6a488b50516764df675915ff44
languageName: node
linkType: hard

Expand Down Expand Up @@ -1149,7 +1163,7 @@ __metadata:
dependencies:
"@commitlint/cli": ^17.0.3
"@commitlint/config-conventional": ^17.0.3
"@discordjs/builders": ^0.16.0
"@discordjs/builders": ^0.15.0
"@favware/cliff-jumper": ^1.8.5
"@favware/npm-deprecate": ^1.0.4
"@favware/rollup-type-bundler": ^1.0.9
Expand Down Expand Up @@ -1237,7 +1251,7 @@ __metadata:
languageName: node
linkType: hard

"@sapphire/shapeshift@npm:^3.5.1":
"@sapphire/shapeshift@npm:^3.1.0, @sapphire/shapeshift@npm:^3.5.1":
version: 3.5.1
resolution: "@sapphire/shapeshift@npm:3.5.1"
dependencies:
Expand Down Expand Up @@ -1283,9 +1297,16 @@ __metadata:
linkType: hard

"@sinclair/typebox@npm:^0.24.1":
version: 0.24.20
resolution: "@sinclair/typebox@npm:0.24.20"
checksum: bb2e95ab60236ebbcaf3c0735b01a8ce6bea068bb1214a8016f8fea7bc2027d69b08437998425d93a3ac38ded3dbe8c64e218e635c09282cb3dd5d5a64269076
version: 0.24.22
resolution: "@sinclair/typebox@npm:0.24.22"
checksum: a21638c2058295602ed726eb1aa52fb585c6e866ebdeefb182a3b3c994370464ebd03b6d3b56c8c79b21df5d2231734fdb8dba8ddbca2c98f0005d6b774c2c5e
languageName: node
linkType: hard

"@sindresorhus/is@npm:^4.6.0":
version: 4.6.0
resolution: "@sindresorhus/is@npm:4.6.0"
checksum: 83839f13da2c29d55c97abc3bc2c55b250d33a0447554997a85c539e058e57b8da092da396e252b11ec24a0279a0bed1f537fa26302209327060643e327f81d2
languageName: node
linkType: hard

Expand Down Expand Up @@ -1466,9 +1487,9 @@ __metadata:
linkType: hard

"@types/node@npm:*, @types/node@npm:>=12, @types/node@npm:^18.6.1":
version: 18.6.1
resolution: "@types/node@npm:18.6.1"
checksum: 06331f68bc73d93b73977ae19ca87818e004bc7b8e70b0d4f73b0ea5e341a4a1ba6f0e79db8fb75a841af2b8d74552d6b9a8f846b267954689f57effedcf5d77
version: 18.6.2
resolution: "@types/node@npm:18.6.2"
checksum: 644c460baedb1fbbd55369ab621167cb39ddaa727fd4fcf4bc7080183cf936d7ff8c2c886ba93ff42768d6f7a579a540e6d1e63d3adba4e5758fb13671ae68ce
languageName: node
linkType: hard

Expand All @@ -1494,9 +1515,9 @@ __metadata:
linkType: hard

"@types/prettier@npm:^2.1.5":
version: 2.6.3
resolution: "@types/prettier@npm:2.6.3"
checksum: e1836699ca189fff6d2a73dc22e028b6a6f693ed1180d5998ac29fa197caf8f85aa92cb38db642e4a370e616b451cb5722ad2395dab11c78e025a1455f37d1f0
version: 2.6.4
resolution: "@types/prettier@npm:2.6.4"
checksum: a8ec6601cbacf8040782cc883bf1a9393fdcb991ebe88440b0f875bb1556652927ac9fe61a721b6c666ac6252158ba327ce2868559bafa2c86e7dfef4089782a
languageName: node
linkType: hard

Expand Down Expand Up @@ -1813,12 +1834,12 @@ __metadata:
linkType: hard

"are-we-there-yet@npm:^3.0.0":
version: 3.0.0
resolution: "are-we-there-yet@npm:3.0.0"
version: 3.0.1
resolution: "are-we-there-yet@npm:3.0.1"
dependencies:
delegates: ^1.0.0
readable-stream: ^3.6.0
checksum: 348edfdd931b0b50868b55402c01c3f64df1d4c229ab6f063539a5025fd6c5f5bb8a0cab409bbed8d75d34762d22aa91b7c20b4204eb8177063158d9ba792981
checksum: 52590c24860fa7173bedeb69a4c05fb573473e860197f618b9a28432ee4379049336727ae3a1f9c4cb083114601c1140cee578376164d0e651217a9843f9fe83
languageName: node
linkType: hard

Expand Down Expand Up @@ -2041,16 +2062,16 @@ __metadata:
linkType: hard

"browserslist@npm:^4.20.2":
version: 4.21.2
resolution: "browserslist@npm:4.21.2"
version: 4.21.3
resolution: "browserslist@npm:4.21.3"
dependencies:
caniuse-lite: ^1.0.30001366
electron-to-chromium: ^1.4.188
caniuse-lite: ^1.0.30001370
electron-to-chromium: ^1.4.202
node-releases: ^2.0.6
update-browserslist-db: ^1.0.4
update-browserslist-db: ^1.0.5
bin:
browserslist: cli.js
checksum: 30fe59f8b065f99665ea63819d29c797660f7975857c290f61f570403abed4d7039ca15b6fd21e39a57b87e1a9262f94676114040766fc0da6ccc11faf9fc377
checksum: ff512a7bcca1c530e2854bbdfc7be2791d0fb524097a6340e56e1d5924164c7e4e0a9b070de04cdc4c149d15cb4d4275cb7c626ebbce954278a2823aaad2452a
languageName: node
linkType: hard

Expand Down Expand Up @@ -2187,10 +2208,10 @@ __metadata:
languageName: node
linkType: hard

"caniuse-lite@npm:^1.0.30001366":
version: 1.0.30001370
resolution: "caniuse-lite@npm:1.0.30001370"
checksum: 28e1fd4d623a52945220b189b703556178ec8a185d317e4ae2557a24f68f88bd8168db67700970164690dbf7d29df69efbd318b54457b335a4361314bb530792
"caniuse-lite@npm:^1.0.30001370":
version: 1.0.30001373
resolution: "caniuse-lite@npm:1.0.30001373"
checksum: cd2f027e2fcf66ed3b0e3eccec89df871f951f2e7600944fae2c3f6f1c37ac82392e573c279e15bf851b75f9696472e38d33fd52d964819ffb8af7af4078ceba
languageName: node
linkType: hard

Expand Down Expand Up @@ -2788,8 +2809,8 @@ __metadata:
linkType: hard

"discord.js@npm:^13.9.1":
version: 13.9.1
resolution: "discord.js@npm:13.9.1"
version: 13.9.2
resolution: "discord.js@npm:13.9.2"
dependencies:
"@discordjs/builders": ^0.16.0
"@discordjs/collection": ^0.7.0
Expand All @@ -2800,7 +2821,7 @@ __metadata:
form-data: ^4.0.0
node-fetch: ^2.6.7
ws: ^8.8.1
checksum: 8c2b5d15d5981b05b55049ae667ec37c870105c6eae784f11e9755affca5299693cffc06b77cf8b2b5ee3c62cecb429179361aedc2e8422bc2c8cf63308b8100
checksum: e49228e2d786262ef06e611ba0d0edd3b1a773e04ce19f1536dbb5590eecc26a3667280ac8fe6801df55ae7964d01043c7060034fc306176fbbee97efce9efd6
languageName: node
linkType: hard

Expand Down Expand Up @@ -2829,10 +2850,10 @@ __metadata:
languageName: node
linkType: hard

"electron-to-chromium@npm:^1.4.188":
version: 1.4.201
resolution: "electron-to-chromium@npm:1.4.201"
checksum: dc8bff80ffc17dec64cdde97ef249292fc14e4ef6a3cb7fd3c1a0691fa846053a993cc6244ff0302c8d4d19baa4fdf0d1a39b413dda87415fec69c7c7a5a05b8
"electron-to-chromium@npm:^1.4.202":
version: 1.4.206
resolution: "electron-to-chromium@npm:1.4.206"
checksum: 1c9b7e867de6a074b389126a655e8edcb1841fb10e44e221164315169d0e53cacb3f90e75ae863f07d74764271720693f5708596f36575c6cd2264651b87bd33
languageName: node
linkType: hard

Expand Down Expand Up @@ -6010,16 +6031,16 @@ __metadata:
linkType: hard

"rollup@npm:^2.75.7, rollup@npm:^2.77.1":
version: 2.77.1
resolution: "rollup@npm:2.77.1"
version: 2.77.2
resolution: "rollup@npm:2.77.2"
dependencies:
fsevents: ~2.3.2
dependenciesMeta:
fsevents:
optional: true
bin:
rollup: dist/bin/rollup
checksum: 57a03a2490cd12008ab96d8ed98f6551bf2c4e328f0bceffdaa8a67a98acaa6221bc9294fc459c800324d8459c0837716c1f428ac2680beddd6bc20e1d8cb98a
checksum: 5a84fb98a6f858906bceba091430442f6c1f362b07c5fa9123b708f87e39f52640e34a189cd9a1776ceae61300055c78ba648205fa03188451539ebeb19797df
languageName: node
linkType: hard

Expand Down Expand Up @@ -6821,7 +6842,7 @@ __metadata:
languageName: node
linkType: hard

"update-browserslist-db@npm:^1.0.4":
"update-browserslist-db@npm:^1.0.5":
version: 1.0.5
resolution: "update-browserslist-db@npm:1.0.5"
dependencies:
Expand Down

0 comments on commit 747be01

Please sign in to comment.