fix: fix schedule based on comments

Author: btrn11

command-snapshot.json

@@ -198,7 +198,7 @@
   {
     "alias": [],
     "command": "package:pushupgrade:schedule",
-    "flagAliases": ["target-hub-org", "targetdevhubusername"],
+    "flagAliases": ["targetdevhubusername"],
     "flagChars": ["l", "p", "t", "v"],
     "flags": [
       "api-version",

schemas/package-pushupgrade-schedule.json

@@ -1,17 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$ref": "#/definitions/PushScheduleResult",
+  "$ref": "#/definitions/PackagePushScheduleResult",
   "definitions": {
-    "PushScheduleResult": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/PackagePushScheduleResult"
-        },
-        {
-          "$ref": "#/definitions/SfError"
-        }
-      ]
-    },
     "PackagePushScheduleResult": {
       "type": "object",
       "properties": {
@@ -27,93 +17,6 @@
       },
       "required": ["PushRequestId", "ScheduledStartTime", "Status"],
       "additionalProperties": false
-    },
-    "SfError": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string"
-        },
-        "message": {
-          "type": "string"
-        },
-        "stack": {
-          "type": "string"
-        },
-        "actions": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "Action messages. Hints to the users regarding what can be done to fix related issues."
-        },
-        "exitCode": {
-          "type": "number",
-          "description": "SfdxCommand can return this process exit code."
-        },
-        "context": {
-          "type": "string",
-          "description": "The related context for this error."
-        },
-        "data": {
-          "$ref": "#/definitions/AnyJson"
-        }
-      },
-      "required": ["exitCode", "message", "name"],
-      "additionalProperties": false,
-      "description": "A generalized sfdx error which also contains an action. The action is used in the CLI to help guide users past the error.\n\nTo throw an error in a synchronous function you must either pass the error message and actions directly to the constructor, e.g.\n\n``` // To load a message bundle (Note that __dirname should contain a messages folder) Messages.importMessagesDirectory(__dirname); const messages = Messages.load('myPackageName', 'myBundleName');\n\n// To throw a non-bundle based error: throw new SfError(message.getMessage('myError'), 'MyErrorName'); ```"
-    },
-    "AnyJson": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/JsonPrimitive"
-        },
-        {
-          "$ref": "#/definitions/JsonCollection"
-        }
-      ],
-      "description": "Any valid JSON value."
-    },
-    "JsonPrimitive": {
-      "type": ["null", "boolean", "number", "string"],
-      "description": "Any valid JSON primitive value."
-    },
-    "JsonCollection": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/JsonMap"
-        },
-        {
-          "$ref": "#/definitions/JsonArray"
-        }
-      ],
-      "description": "Any valid JSON collection value."
-    },
-    "JsonMap": {
-      "type": "object",
-      "additionalProperties": {
-        "$ref": "#/definitions/Optional%3CAnyJson%3E"
-      },
-      "properties": {},
-      "description": "Any JSON-compatible object."
-    },
-    "Optional<AnyJson>": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/AnyJson"
-        },
-        {
-          "not": {}
-        }
-      ],
-      "description": "A union type for either the parameterized type `T` or `undefined` -- the opposite of  {@link  NonOptional  } ."
-    },
-    "JsonArray": {
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/AnyJson"
-      },
-      "description": "Any JSON-compatible array."
     }
   }
 }

src/commands/package/pushupgrade/schedule.ts

@@ -5,24 +5,21 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import fs from 'node:fs/promises';
-import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
+import { Flags, SfCommand, requiredHubFlagWithDeprecations } from '@salesforce/sf-plugins-core';
 import { Messages, SfError } from '@salesforce/core';
 import { PackagePushScheduleResult, PackagePushUpgrade } from '@salesforce/packaging';
-import { requiredHubFlag } from '../../../utils/hubFlag.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-packaging', 'package_pushupgrade_schedule');
 
-export type PushScheduleResult = PackagePushScheduleResult | SfError;
-
-export class PackagePushScheduleCommand extends SfCommand<PushScheduleResult> {
+export class PackagePushScheduleCommand extends SfCommand<PackagePushScheduleResult> {
   public static readonly summary = messages.getMessage('summary');
   public static readonly description = messages.getMessage('description');
   public static readonly examples = messages.getMessages('examples');
   public static readonly hidden = true;
   public static state = 'beta';
   public static readonly flags = {
-    'target-dev-hub': requiredHubFlag,
+    'target-dev-hub': requiredHubFlagWithDeprecations,
     'api-version': Flags.orgApiVersion(),
     'package-version-id': Flags.salesforceId({
       length: 'both',
@@ -43,7 +40,7 @@ export class PackagePushScheduleCommand extends SfCommand<PushScheduleResult> {
     }),
   };
 
-  public async run(): Promise<PushScheduleResult> {
+  public async run(): Promise<PackagePushScheduleResult> {
     const { flags } = await this.parse(PackagePushScheduleCommand);
 
     // Read and validate org list
@@ -60,11 +57,7 @@ export class PackagePushScheduleCommand extends SfCommand<PushScheduleResult> {
       orgList
     );
 
-    if ((result as PushScheduleResult) && !(result instanceof SfError)) {
-      this.log(messages.getMessage('output', [result?.PushRequestId]));
-    } else {
-      throw result;
-    }
+    this.log(messages.getMessage('output', [result?.PushRequestId]));
 
     return result;
   }