Skip to content

Commit 9b14bfb

Browse files
committed
fix: propagate data from original error
1 parent ce5ddcf commit 9b14bfb

File tree

3 files changed

+31
-30
lines changed

3 files changed

+31
-30
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"@inquirer/confirm": "^2.0.17",
4747
"@inquirer/password": "^1.1.16",
4848
"@oclif/core": "^3.26.6",
49-
"@salesforce/core": "^7.3.6",
49+
"@salesforce/core": "^7.3.8",
5050
"@salesforce/kit": "^3.1.1",
5151
"@salesforce/ts-types": "^2.0.9",
5252
"chalk": "^5.3.0"

src/sfCommand.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,9 @@ export abstract class SfCommand<T> extends Command {
406406
(error.actions as string[]) ?? [],
407407
process.exitCode
408408
);
409+
if (sfCommandError.data) {
410+
err.data = sfCommandError.data as AnyJson;
411+
}
409412
err.context = sfCommandError.context;
410413
err.stack = sfCommandError.stack;
411414
// @ts-expect-error because code is not on SfError

yarn.lock

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@
623623
resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
624624
integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
625625

626-
"@salesforce/core@^7.3.1", "@salesforce/core@^7.3.6":
626+
"@salesforce/core@^7.3.1":
627627
version "7.3.6"
628628
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-7.3.6.tgz#b2769abf3d8cee6fef26741dd9bdbe977a497023"
629629
integrity sha512-LngaY4GxixZ7X5oPGa00NdRzpqTXC8jPOQ/H+oFNiZb8nhMfYTBsQob258z33sIBf+G/5RZOJgX10Z+teJzt6A==
@@ -646,6 +646,29 @@
646646
semver "^7.6.2"
647647
ts-retry-promise "^0.7.1"
648648

649+
"@salesforce/core@^7.3.8":
650+
version "7.3.8"
651+
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-7.3.8.tgz#8a646b5321f08c0fb4d22e2fa8b1d60b3a20df9b"
652+
integrity sha512-VWhXHfjwjtC3pJWYp8wt5/fnNQ5tK61ovMG5eteXzVD2oFd7og1f6YjwuAzoYIZK7kYWWv7KJfGtCsPs7Zw+Ww==
653+
dependencies:
654+
"@jsforce/jsforce-node" "^3.2.0"
655+
"@salesforce/kit" "^3.1.1"
656+
"@salesforce/schemas" "^1.7.0"
657+
"@salesforce/ts-types" "^2.0.9"
658+
ajv "^8.13.0"
659+
change-case "^4.1.2"
660+
faye "^1.4.0"
661+
form-data "^4.0.0"
662+
js2xmlparser "^4.0.1"
663+
jsonwebtoken "9.0.2"
664+
jszip "3.10.1"
665+
pino "^8.21.0"
666+
pino-abstract-transport "^1.1.0"
667+
pino-pretty "^10.3.1"
668+
proper-lockfile "^4.1.2"
669+
semver "^7.6.2"
670+
ts-retry-promise "^0.7.1"
671+
649672
"@salesforce/dev-config@^4.1.0":
650673
version "4.1.0"
651674
resolved "https://registry.yarnpkg.com/@salesforce/dev-config/-/dev-config-4.1.0.tgz#e529576466d074e7a5f1441236510fef123da01e"
@@ -4747,16 +4770,7 @@ srcset@^5.0.0:
47474770
resolved "https://registry.yarnpkg.com/srcset/-/srcset-5.0.0.tgz#9df6c3961b5b44a02532ce6ae4544832609e2e3f"
47484771
integrity sha512-SqEZaAEhe0A6ETEa9O1IhSPC7MdvehZtCnTR0AftXk3QhY2UNgb+NApFOUPZILXk/YTDfFxMTNJOBpzrJsEdIA==
47494772

4750-
"string-width-cjs@npm:string-width@^4.2.0":
4751-
version "4.2.3"
4752-
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
4753-
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
4754-
dependencies:
4755-
emoji-regex "^8.0.0"
4756-
is-fullwidth-code-point "^3.0.0"
4757-
strip-ansi "^6.0.1"
4758-
4759-
string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
4773+
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
47604774
version "4.2.3"
47614775
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
47624776
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -4815,14 +4829,7 @@ string_decoder@~1.1.1:
48154829
dependencies:
48164830
safe-buffer "~5.1.0"
48174831

4818-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
4819-
version "6.0.1"
4820-
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
4821-
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
4822-
dependencies:
4823-
ansi-regex "^5.0.1"
4824-
4825-
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
4832+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
48264833
version "6.0.1"
48274834
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
48284835
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -5310,7 +5317,7 @@ workerpool@6.2.1:
53105317
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
53115318
integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==
53125319

5313-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
5320+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
53145321
version "7.0.0"
53155322
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
53165323
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -5328,15 +5335,6 @@ wrap-ansi@^6.2.0:
53285335
string-width "^4.1.0"
53295336
strip-ansi "^6.0.0"
53305337

5331-
wrap-ansi@^7.0.0:
5332-
version "7.0.0"
5333-
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
5334-
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
5335-
dependencies:
5336-
ansi-styles "^4.0.0"
5337-
string-width "^4.1.0"
5338-
strip-ansi "^6.0.0"
5339-
53405338
wrap-ansi@^8.1.0:
53415339
version "8.1.0"
53425340
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

0 commit comments

Comments
 (0)