@salesforce/sf-plugins-core 2.2.0 → 2.2.2

package/lib/sfCommand.js

@@ -255,11 +255,19 @@ class SfCommand extends core_1.Command {
     }
     async catch(error) {
         // transform an unknown error into one that conforms to the interface
-        const codeFromError = error instanceof core_2.SfError ? error.exitCode : 1;
+        // @ts-expect-error because exitCode is not on Error
+        const codeFromError = error.exitCode ?? 1;
         process.exitCode ?? (process.exitCode = codeFromError);
-        const sfErrorProperties = error instanceof core_2.SfError
-            ? { data: error.data, actions: error.actions, code: codeFromError, context: error.context }
-            : {};
+        const sfErrorProperties = removeEmpty({
+            // @ts-expect-error because data is not on Error
+            data: error.data ?? null,
+            // @ts-expect-error because actions is not on Error
+            actions: error.actions ?? null,
+            code: codeFromError,
+            // @ts-expect-error because context is not on Error
+            context: error.context ?? null,
+        });
+        // Create printable error object
         const sfCommandError = {
             ...sfErrorProperties,
             ...{
@@ -276,7 +284,17 @@ class SfCommand extends core_1.Command {
         else {
             this.logToStderr(this.formatError(sfCommandError));
         }
-        return sfCommandError;
+        // Create SfError that can be thrown
+        const err = new core_2.SfError(error.message, error.name ?? 'Error', 
+        // @ts-expect-error because actions is not on Error
+        error.actions ?? [], process.exitCode);
+        err.context = sfCommandError.context;
+        err.stack = sfCommandError.stack;
+        // @ts-expect-error because code is not on SfError
+        err.code = codeFromError;
+        // @ts-expect-error because code is not on SfError
+        err.status = sfCommandError.status;
+        throw err;
     }
     /**
      * Format errors and actions for human consumption. Adds 'Error (<ErrorCode>):',
@@ -335,4 +353,8 @@ SfCommand.enableJsonFlag = true;
  * ```
  */
 SfCommand.tableFlags = core_1.ux.table.flags;
+function removeEmpty(obj) {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    return Object.fromEntries(Object.entries(obj).filter(([_, v]) => v != null));
+}
 //# sourceMappingURL=sfCommand.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/sf-plugins-core",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "Utils for writing Salesforce CLI plugins",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",