@salesforce/sf-plugins-core 5.0.13 → 5.0.14-dev.0

package/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2023, Salesforce.com, Inc.
+Copyright (c) 2024, Salesforce.com, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

package/README.md

@@ -16,10 +16,7 @@ The SfCommand abstract class extends [@oclif/core's Command class](https://githu
 - Provides functions that help place success messages, warnings and errors into the correct location in JSON results
 - Enables additional help sections to the standard oclif command help output
 - Provides access to the [cli-ux cli actions](https://github.com/oclif/cli-ux#cliaction). This avoids having to import that interface from cli-ux and manually handling the `--json` flag.
-
-## Prompter Class
-
-A general purpose class that prompts a user for information. See [inquirer NPM Module](https://www.npmjs.com/package/inquirer) for more information.
+- Provides simple, stubbable prompts for confirmation and secrets
 
 ## Flags
 
@@ -29,7 +26,7 @@ Flags is a convenience reference to [@oclif/core#Flags](https://github.com/oclif
 
 These flags can be imported into a command and used like any other flag. See code examples in the links
 
-- [orgApiVersionFlag](src/flags/apiVersion.ts)
+- [orgApiVersionFlag](src/flags/orgApiVersion.ts)
   - specifies a Salesforce API version.
   - reads from Config (if available)
   - validates version is still active

package/lib/compatibility.d.ts

@@ -14,7 +14,7 @@
  * }
  * ```
  */
-export declare const orgApiVersionFlagWithDeprecations: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+export declare const orgApiVersionFlagWithDeprecations: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
 /**
  * Use only for commands that maintain sfdx compatibility.
  * Flag will be hidden and will show a warning if used.
@@ -23,23 +23,23 @@ export declare const orgApiVersionFlagWithDeprecations: import("@oclif/core/lib/
  * @deprecated
  *
  */
-export declare const loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+export declare const loglevel: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
 /**
  * @deprecated
  */
-export declare const optionalOrgFlagWithDeprecations: import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces").CustomOptions>;
+export declare const optionalOrgFlagWithDeprecations: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
 /**
  * @deprecated
  */
-export declare const requiredOrgFlagWithDeprecations: import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces").CustomOptions>;
+export declare const requiredOrgFlagWithDeprecations: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
 /**
  * @deprecated
  */
-export declare const requiredHubFlagWithDeprecations: import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces").CustomOptions>;
+export declare const requiredHubFlagWithDeprecations: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
 /**
  * @deprecated
  */
-export declare const optionalHubFlagWithDeprecations: import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/core").Org | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+export declare const optionalHubFlagWithDeprecations: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<import("@salesforce/core").Org | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
 export type ArrayWithDeprecationOptions = {
     multiple?: true;
     parse?: undefined;
@@ -47,7 +47,7 @@ export type ArrayWithDeprecationOptions = {
 /**
  * @deprecated
  */
-export declare const arrayWithDeprecation: import("@oclif/core/lib/interfaces").FlagDefinition<string[], ArrayWithDeprecationOptions, {
+export declare const arrayWithDeprecation: import("@oclif/core/lib/interfaces/parser.js").FlagDefinition<string[], ArrayWithDeprecationOptions, {
     multiple: true;
     requiredOrDefaulted: true;
 }>;

package/lib/compatibility.js

@@ -1,16 +1,13 @@
-"use strict";
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.arrayWithDeprecation = exports.optionalHubFlagWithDeprecations = exports.requiredHubFlagWithDeprecations = exports.requiredOrgFlagWithDeprecations = exports.optionalOrgFlagWithDeprecations = exports.loglevel = exports.orgApiVersionFlagWithDeprecations = void 0;
-const core_1 = require("@oclif/core");
-const core_2 = require("@salesforce/core");
-const orgApiVersion_1 = require("./flags/orgApiVersion");
-const orgFlags_1 = require("./flags/orgFlags");
+import { Flags } from '@oclif/core';
+import { Lifecycle, Messages } from '@salesforce/core';
+import { orgApiVersionFlag } from './flags/orgApiVersion.js';
+import { optionalHubFlag, optionalOrgFlag, requiredHubFlag, requiredOrgFlag } from './flags/orgFlags.js';
 /**
  * Adds an alias for the deprecated sfdx-style "apiversion" and provides a warning if it is used
  * See orgApiVersionFlag for full details
@@ -27,12 +24,12 @@ const orgFlags_1 = require("./flags/orgFlags");
  * }
  * ```
  */
-exports.orgApiVersionFlagWithDeprecations = (0, orgApiVersion_1.orgApiVersionFlag)({
+export const orgApiVersionFlagWithDeprecations = orgApiVersionFlag({
     aliases: ['apiversion'],
     deprecateAliases: true,
 });
-core_2.Messages.importMessagesDirectory(__dirname);
-const messages = core_2.Messages.loadMessages('@salesforce/sf-plugins-core', 'messages');
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+const messages = Messages.loadMessages('@salesforce/sf-plugins-core', 'messages');
 /**
  * Use only for commands that maintain sfdx compatibility.
  * Flag will be hidden and will show a warning if used.
@@ -41,7 +38,7 @@ const messages = core_2.Messages.loadMessages('@salesforce/sf-plugins-core', 'me
  * @deprecated
  *
  */
-exports.loglevel = core_1.Flags.string({
+export const loglevel = Flags.string({
     hidden: true,
     deprecated: {
         message: messages.getMessage('warning.loglevel'),
@@ -54,20 +51,20 @@ const deprecatedOrgAliases = {
 /**
  * @deprecated
  */
-exports.optionalOrgFlagWithDeprecations = (0, orgFlags_1.optionalOrgFlag)({
+export const optionalOrgFlagWithDeprecations = optionalOrgFlag({
     ...deprecatedOrgAliases,
 });
 /**
  * @deprecated
  */
-exports.requiredOrgFlagWithDeprecations = (0, orgFlags_1.requiredOrgFlag)({
+export const requiredOrgFlagWithDeprecations = requiredOrgFlag({
     ...deprecatedOrgAliases,
     required: true,
 });
 /**
  * @deprecated
  */
-exports.requiredHubFlagWithDeprecations = (0, orgFlags_1.requiredHubFlag)({
+export const requiredHubFlagWithDeprecations = requiredHubFlag({
     aliases: ['targetdevhubusername'],
     deprecateAliases: true,
     required: true,
@@ -75,7 +72,7 @@ exports.requiredHubFlagWithDeprecations = (0, orgFlags_1.requiredHubFlag)({
 /**
  * @deprecated
  */
-exports.optionalHubFlagWithDeprecations = (0, orgFlags_1.optionalHubFlag)({
+export const optionalHubFlagWithDeprecations = optionalHubFlag({
     aliases: ['targetdevhubusername'],
     deprecateAliases: true,
     required: false,
@@ -83,7 +80,7 @@ exports.optionalHubFlagWithDeprecations = (0, orgFlags_1.optionalHubFlag)({
 /**
  * @deprecated
  */
-exports.arrayWithDeprecation = core_1.Flags.custom({
+export const arrayWithDeprecation = Flags.custom({
     multiple: true,
     delimiter: ',',
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -94,7 +91,7 @@ exports.arrayWithDeprecation = core_1.Flags.custom({
     parse: async (input, ctx) => {
         const inputParts = ctx.token.input.split(',').map((i) => i.trim());
         if (inputParts.length > 1) {
-            await core_2.Lifecycle.getInstance().emitWarning(messages.getMessage('warning.arrayInputFormat'));
+            await Lifecycle.getInstance().emitWarning(messages.getMessage('warning.arrayInputFormat'));
         }
         return input;
     },

package/lib/errorFormatting.d.ts

@@ -0,0 +1,22 @@
+import type { ChalkInstance } from 'chalk';
+import { SfCommand } from './sfCommandNamespace.js';
+/**
+ * Format errors and actions for human consumption. Adds 'Error (<ErrorCode>):',
+ * When there are actions, we add 'Try this:' in blue
+ * followed by each action in red on its own line.
+ * If Error.code is present it is output last in parentheses
+ *
+ * @returns {string} Returns decorated messages.
+ */
+/**
+ * Utility function to format actions lines
+ *
+ * @param actions
+ * @param options
+ * @private
+ */
+export declare const formatActions: (actions: string[], options?: {
+    actionColor: ChalkInstance;
+}) => string[];
+export declare const formatError: (error: SfCommand.Error) => string;
+//# sourceMappingURL=errorFormatting.d.ts.map

package/lib/errorFormatting.js

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2023, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+import { Mode, Messages, envVars } from '@salesforce/core';
+import { StandardColors } from './ux/standardColors.js';
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+const messages = Messages.loadMessages('@salesforce/sf-plugins-core', 'messages');
+/**
+ * Format errors and actions for human consumption. Adds 'Error (<ErrorCode>):',
+ * When there are actions, we add 'Try this:' in blue
+ * followed by each action in red on its own line.
+ * If Error.code is present it is output last in parentheses
+ *
+ * @returns {string} Returns decorated messages.
+ */
+/**
+ * Utility function to format actions lines
+ *
+ * @param actions
+ * @param options
+ * @private
+ */
+export const formatActions = (actions, options = { actionColor: StandardColors.info }) => actions.length
+    ? [
+        `\n${StandardColors.info(messages.getMessage('actions.tryThis'))}\n`,
+        ...actions.map((a) => `${options.actionColor(a)}`),
+    ]
+    : [];
+export const formatError = (error) => [
+    `${formatErrorPrefix(error)} ${error.message}`,
+    ...formatActions(error.actions ?? []),
+    error.stack && envVars.getString('SF_ENV') === Mode.DEVELOPMENT
+        ? StandardColors.info(`\n*** Internal Diagnostic ***\n\n${error.stack}\n******\n`)
+        : [],
+].join('\n');
+const formatErrorPrefix = (error) => `${StandardColors.error(messages.getMessage('error.prefix', [formatErrorCode(error)]))}`;
+const formatErrorCode = (error) => typeof error.code === 'string' || typeof error.code === 'number' ? ` (${error.code})` : '';
+//# sourceMappingURL=errorFormatting.js.map

package/lib/exported.d.ts

@@ -1,71 +1,10 @@
-/// <reference types="node" />
-import { Flags as OclifFlags } from '@oclif/core';
-export { toHelpSection, parseVarArgs } from './util';
-export { Deployable, Deployer, DeployerResult } from './deployer';
-export { Deauthorizer } from './deauthorizer';
-export { Progress, Prompter, generateTableChoices, Ux, Spinner, Separator } from './ux';
-export { SfHook } from './hooks';
-export * from './types';
-export { SfCommand, SfCommandInterface, StandardColors } from './sfCommand';
-export * from './compatibility';
-export * from './stubUx';
-export declare const Flags: {
-    boolean: typeof OclifFlags.boolean;
-    directory: import("@oclif/core/lib/interfaces").FlagDefinition<string, {
-        exists?: boolean | undefined;
-    }, {
-        multiple: false;
-        requiredOrDefaulted: false;
-    }>;
-    file: import("@oclif/core/lib/interfaces").FlagDefinition<string, {
-        exists?: boolean | undefined;
-    }, {
-        multiple: false;
-        requiredOrDefaulted: false;
-    }>;
-    integer: import("@oclif/core/lib/interfaces").FlagDefinition<number, {
-        max?: number | undefined;
-        min?: number | undefined;
-    }, {
-        multiple: false;
-        requiredOrDefaulted: false;
-    }>;
-    string: import("@oclif/core/lib/interfaces").FlagDefinition<string, import("@oclif/core/lib/interfaces").CustomOptions, {
-        multiple: false;
-        requiredOrDefaulted: false;
-    }>;
-    url: import("@oclif/core/lib/interfaces").FlagDefinition<import("url").URL, import("@oclif/core/lib/interfaces").CustomOptions, {
-        multiple: false;
-        requiredOrDefaulted: false;
-    }>;
-    custom: typeof OclifFlags.custom;
-    duration: import("@oclif/core/lib/interfaces").FlagDefinition<import("@salesforce/kit").Duration, import("./flags/duration").DurationFlagConfig, {
-        multiple: false;
-        requiredOrDefaulted: true;
-    }>;
-    salesforceId: import("@oclif/core/lib/interfaces").FlagDefinition<string, import("./flags/salesforceId").IdFlagConfig, {
-        multiple: false;
-        requiredOrDefaulted: false;
-    }>;
-    orgApiVersion: import("@oclif/core/lib/interfaces").FlagDefinition<string, import("@oclif/core/lib/interfaces").CustomOptions, {
-        multiple: false;
-        requiredOrDefaulted: false;
-    }>;
-    requiredOrg: import("@oclif/core/lib/interfaces").FlagDefinition<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces").CustomOptions, {
-        multiple: false;
-        requiredOrDefaulted: true;
-    }>;
-    requiredHub: import("@oclif/core/lib/interfaces").FlagDefinition<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces").CustomOptions, {
-        multiple: false;
-        requiredOrDefaulted: true;
-    }>;
-    optionalOrg: import("@oclif/core/lib/interfaces").FlagDefinition<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces").CustomOptions, {
-        multiple: false;
-        requiredOrDefaulted: true;
-    }>;
-    optionalHub: import("@oclif/core/lib/interfaces").FlagDefinition<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces").CustomOptions, {
-        multiple: false;
-        requiredOrDefaulted: true;
-    }>;
-};
+export { toHelpSection, parseVarArgs } from './util.js';
+export { Progress } from './ux/progress.js';
+export { Spinner } from './ux/spinner.js';
+export { Ux } from './ux/ux.js';
+export { StandardColors } from './ux/standardColors.js';
+export { SfCommand, SfCommandInterface } from './sfCommand.js';
+export * from './compatibility.js';
+export * from './stubUx.js';
+export { Flags } from './flags/flags.js';
 //# sourceMappingURL=exported.d.ts.map

package/lib/exported.js

@@ -1,69 +1,16 @@
-"use strict";
 /*
  * Copyright (c) 2022, salesforce.com, inc.
  * All rights reserved.
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Flags = exports.StandardColors = exports.SfCommand = exports.SfHook = exports.Separator = exports.Spinner = exports.Ux = exports.generateTableChoices = exports.Prompter = exports.Progress = exports.Deauthorizer = exports.Deployer = exports.Deployable = exports.parseVarArgs = exports.toHelpSection = void 0;
-const core_1 = require("@oclif/core");
-var util_1 = require("./util");
-Object.defineProperty(exports, "toHelpSection", { enumerable: true, get: function () { return util_1.toHelpSection; } });
-Object.defineProperty(exports, "parseVarArgs", { enumerable: true, get: function () { return util_1.parseVarArgs; } });
-var deployer_1 = require("./deployer");
-Object.defineProperty(exports, "Deployable", { enumerable: true, get: function () { return deployer_1.Deployable; } });
-Object.defineProperty(exports, "Deployer", { enumerable: true, get: function () { return deployer_1.Deployer; } });
-var deauthorizer_1 = require("./deauthorizer");
-Object.defineProperty(exports, "Deauthorizer", { enumerable: true, get: function () { return deauthorizer_1.Deauthorizer; } });
-var ux_1 = require("./ux");
-Object.defineProperty(exports, "Progress", { enumerable: true, get: function () { return ux_1.Progress; } });
-Object.defineProperty(exports, "Prompter", { enumerable: true, get: function () { return ux_1.Prompter; } });
-Object.defineProperty(exports, "generateTableChoices", { enumerable: true, get: function () { return ux_1.generateTableChoices; } });
-Object.defineProperty(exports, "Ux", { enumerable: true, get: function () { return ux_1.Ux; } });
-Object.defineProperty(exports, "Spinner", { enumerable: true, get: function () { return ux_1.Spinner; } });
-Object.defineProperty(exports, "Separator", { enumerable: true, get: function () { return ux_1.Separator; } });
-var hooks_1 = require("./hooks");
-Object.defineProperty(exports, "SfHook", { enumerable: true, get: function () { return hooks_1.SfHook; } });
-__exportStar(require("./types"), exports);
-var sfCommand_1 = require("./sfCommand");
-Object.defineProperty(exports, "SfCommand", { enumerable: true, get: function () { return sfCommand_1.SfCommand; } });
-Object.defineProperty(exports, "StandardColors", { enumerable: true, get: function () { return sfCommand_1.StandardColors; } });
-__exportStar(require("./compatibility"), exports);
-__exportStar(require("./stubUx"), exports);
-// custom flags
-const orgFlags_1 = require("./flags/orgFlags");
-const salesforceId_1 = require("./flags/salesforceId");
-const orgApiVersion_1 = require("./flags/orgApiVersion");
-const duration_1 = require("./flags/duration");
-exports.Flags = {
-    boolean: core_1.Flags.boolean,
-    directory: core_1.Flags.directory,
-    file: core_1.Flags.file,
-    integer: core_1.Flags.integer,
-    string: core_1.Flags.string,
-    url: core_1.Flags.url,
-    custom: core_1.Flags.custom,
-    duration: duration_1.durationFlag,
-    salesforceId: salesforceId_1.salesforceIdFlag,
-    orgApiVersion: orgApiVersion_1.orgApiVersionFlag,
-    requiredOrg: orgFlags_1.requiredOrgFlag,
-    requiredHub: orgFlags_1.requiredHubFlag,
-    optionalOrg: orgFlags_1.optionalOrgFlag,
-    optionalHub: orgFlags_1.optionalHubFlag,
-};
+export { toHelpSection, parseVarArgs } from './util.js';
+export { Progress } from './ux/progress.js';
+export { Spinner } from './ux/spinner.js';
+export { Ux } from './ux/ux.js';
+export { StandardColors } from './ux/standardColors.js';
+export { SfCommand } from './sfCommand.js';
+export * from './compatibility.js';
+export * from './stubUx.js';
+export { Flags } from './flags/flags.js';
 //# sourceMappingURL=exported.js.map

package/lib/flags/duration.d.ts

@@ -26,7 +26,7 @@ export type DurationFlagConfig = {
  * }
  * ```
  */
-export declare const durationFlag: import("@oclif/core/lib/interfaces").FlagDefinition<Duration, DurationFlagConfig, {
+export declare const durationFlag: import("@oclif/core/lib/interfaces/parser.js").FlagDefinition<Duration, DurationFlagConfig, {
     multiple: false;
     requiredOrDefaulted: true;
 }>;

package/lib/flags/duration.js

@@ -1,17 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.durationFlag = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-const core_1 = require("@oclif/core");
-const core_2 = require("@salesforce/core");
-const kit_1 = require("@salesforce/kit");
-core_2.Messages.importMessagesDirectory(__dirname);
-const messages = core_2.Messages.loadMessages('@salesforce/sf-plugins-core', 'messages');
+import { Flags } from '@oclif/core';
+import { Messages } from '@salesforce/core';
+import { Duration } from '@salesforce/kit';
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+const messages = Messages.loadMessages('@salesforce/sf-plugins-core', 'messages');
 /**
  * Duration flag with built-in default and min/max validation
  * You must specify a unit
@@ -32,7 +29,7 @@ const messages = core_2.Messages.loadMessages('@salesforce/sf-plugins-core', 'me
  * }
  * ```
  */
-exports.durationFlag = core_1.Flags.custom({
+export const durationFlag = Flags.custom({
     // eslint-disable-next-line @typescript-eslint/require-await
     parse: async (input, _, opts) => validate(input, opts),
     // eslint-disable-next-line @typescript-eslint/require-await
@@ -63,5 +60,5 @@ const validate = (input, config) => {
     }
     return toDuration(parsedInput, unit);
 };
-const toDuration = (parsedInput, unit) => kit_1.Duration[unit](parsedInput);
+const toDuration = (parsedInput, unit) => Duration[unit](parsedInput);
 //# sourceMappingURL=duration.js.map

package/lib/flags/flags.d.ts

@@ -0,0 +1,63 @@
+/// <reference types="node" resolution-mode="require"/>
+import { Flags as OclifFlags } from '@oclif/core';
+export declare const Flags: {
+    boolean: typeof OclifFlags.boolean;
+    directory: import("@oclif/core/lib/interfaces/parser.js").FlagDefinition<string, {
+        exists?: boolean | undefined;
+    }, {
+        multiple: false;
+        requiredOrDefaulted: false;
+    }>;
+    file: import("@oclif/core/lib/interfaces/parser.js").FlagDefinition<string, {
+        exists?: boolean | undefined;
+    }, {
+        multiple: false;
+        requiredOrDefaulted: false;
+    }>;
+    integer: import("@oclif/core/lib/interfaces/parser.js").FlagDefinition<number, {
+        max?: number | undefined;
+        min?: number | undefined;
+    }, {
+        multiple: false;
+        requiredOrDefaulted: false;
+    }>;
+    string: import("@oclif/core/lib/interfaces/parser.js").FlagDefinition<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions, {
+        multiple: false;
+        requiredOrDefaulted: false;
+    }>;
+    option: typeof OclifFlags.option;
+    url: import("@oclif/core/lib/interfaces/parser.js").FlagDefinition<import("url").URL, import("@oclif/core/lib/interfaces/parser.js").CustomOptions, {
+        multiple: false;
+        requiredOrDefaulted: false;
+    }>;
+    custom: typeof OclifFlags.custom;
+    duration: import("@oclif/core/lib/interfaces/parser.js").FlagDefinition<import("@salesforce/kit").Duration, import("./duration.js").DurationFlagConfig, {
+        multiple: false;
+        requiredOrDefaulted: true;
+    }>;
+    salesforceId: import("@oclif/core/lib/interfaces/parser.js").FlagDefinition<string, import("./salesforceId.js").IdFlagConfig, {
+        multiple: false;
+        requiredOrDefaulted: false;
+    }>;
+    orgApiVersion: import("@oclif/core/lib/interfaces/parser.js").FlagDefinition<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions, {
+        multiple: false;
+        requiredOrDefaulted: false;
+    }>;
+    requiredOrg: import("@oclif/core/lib/interfaces/parser.js").FlagDefinition<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces/parser.js").CustomOptions, {
+        multiple: false;
+        requiredOrDefaulted: true;
+    }>;
+    requiredHub: import("@oclif/core/lib/interfaces/parser.js").FlagDefinition<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces/parser.js").CustomOptions, {
+        multiple: false;
+        requiredOrDefaulted: true;
+    }>;
+    optionalOrg: import("@oclif/core/lib/interfaces/parser.js").FlagDefinition<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces/parser.js").CustomOptions, {
+        multiple: false;
+        requiredOrDefaulted: true;
+    }>;
+    optionalHub: import("@oclif/core/lib/interfaces/parser.js").FlagDefinition<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces/parser.js").CustomOptions, {
+        multiple: false;
+        requiredOrDefaulted: true;
+    }>;
+};
+//# sourceMappingURL=flags.d.ts.map

package/lib/flags/flags.js

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2023, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+import { Flags as OclifFlags } from '@oclif/core';
+// custom flags
+import { requiredOrgFlag, requiredHubFlag, optionalOrgFlag, optionalHubFlag } from './orgFlags.js';
+import { salesforceIdFlag } from './salesforceId.js';
+import { orgApiVersionFlag } from './orgApiVersion.js';
+import { durationFlag } from './duration.js';
+export const Flags = {
+    boolean: OclifFlags.boolean,
+    directory: OclifFlags.directory,
+    file: OclifFlags.file,
+    integer: OclifFlags.integer,
+    string: OclifFlags.string,
+    option: OclifFlags.option,
+    url: OclifFlags.url,
+    custom: OclifFlags.custom,
+    duration: durationFlag,
+    salesforceId: salesforceIdFlag,
+    orgApiVersion: orgApiVersionFlag,
+    requiredOrg: requiredOrgFlag,
+    requiredHub: requiredHubFlag,
+    optionalOrg: optionalOrgFlag,
+    optionalHub: optionalHubFlag,
+};
+//# sourceMappingURL=flags.js.map

package/lib/flags/orgApiVersion.d.ts

@@ -21,7 +21,7 @@ export declare const maxDeprecatedUrl = "https://help.salesforce.com/s/articleVi
  * }
  * ```
  */
-export declare const orgApiVersionFlag: import("@oclif/core/lib/interfaces").FlagDefinition<string, import("@oclif/core/lib/interfaces").CustomOptions, {
+export declare const orgApiVersionFlag: import("@oclif/core/lib/interfaces/parser.js").FlagDefinition<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions, {
     multiple: false;
     requiredOrDefaulted: false;
 }>;

package/lib/flags/orgApiVersion.js

@@ -1,21 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.orgApiVersionFlag = exports.maxDeprecatedUrl = exports.maxDeprecated = exports.minValidApiVersion = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-const core_1 = require("@oclif/core");
-const core_2 = require("@salesforce/core");
-core_2.Messages.importMessagesDirectory(__dirname);
-const messages = core_2.Messages.loadMessages('@salesforce/sf-plugins-core', 'messages');
+import { Flags } from '@oclif/core';
+import { Messages, Lifecycle, OrgConfigProperties, validateApiVersion } from '@salesforce/core';
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+const messages = Messages.loadMessages('@salesforce/sf-plugins-core', 'messages');
 // versions below this are retired
-exports.minValidApiVersion = 21;
+export const minValidApiVersion = 21;
 // this and all un-retired versions below it are deprecated
-exports.maxDeprecated = 30;
-exports.maxDeprecatedUrl = 'https://help.salesforce.com/s/articleView?id=000354473&type=1;';
+export const maxDeprecated = 30;
+export const maxDeprecatedUrl = 'https://help.salesforce.com/s/articleView?id=000354473&type=1;';
 /**
  * apiVersion for a salesforce org's rest api.
  * Will validate format and that the api version is still supported.
@@ -36,32 +33,32 @@ exports.maxDeprecatedUrl = 'https://help.salesforce.com/s/articleView?id=0003544
  * }
  * ```
  */
-exports.orgApiVersionFlag = core_1.Flags.custom({
+export const orgApiVersionFlag = Flags.custom({
     parse: async (input) => validate(input),
     default: async () => getDefaultFromConfig(),
     description: messages.getMessage('flags.apiVersion.description'),
 });
 const getDefaultFromConfig = async () => {
     // (perf) only import ConfigAggregator if necessary
-    const { ConfigAggregator } = await Promise.resolve().then(() => require('@salesforce/core'));
+    const { ConfigAggregator } = await import('@salesforce/core');
     const config = await ConfigAggregator.create();
-    const apiVersionFromConfig = config.getInfo(core_2.OrgConfigProperties.ORG_API_VERSION)?.value;
+    const apiVersionFromConfig = config.getInfo(OrgConfigProperties.ORG_API_VERSION)?.value;
     if (apiVersionFromConfig) {
-        await core_2.Lifecycle.getInstance().emitWarning(messages.getMessage('flags.apiVersion.overrideWarning', [apiVersionFromConfig]));
+        await Lifecycle.getInstance().emitWarning(messages.getMessage('flags.apiVersion.overrideWarning', [apiVersionFromConfig]));
         return validate(apiVersionFromConfig);
     }
 };
 const validate = async (input) => {
     // basic format check
-    if (!(0, core_2.validateApiVersion)(input)) {
+    if (!validateApiVersion(input)) {
         throw messages.createError('errors.InvalidApiVersion', [input]);
     }
     const requestedVersion = parseInt(input, 10);
-    if (requestedVersion < exports.minValidApiVersion) {
-        throw messages.createError('errors.RetiredApiVersion', [exports.minValidApiVersion]);
+    if (requestedVersion < minValidApiVersion) {
+        throw messages.createError('errors.RetiredApiVersion', [minValidApiVersion]);
     }
-    if (requestedVersion <= exports.maxDeprecated) {
-        await core_2.Lifecycle.getInstance().emitWarning(messages.getMessage('flags.apiVersion.warning.deprecated', [exports.maxDeprecated, exports.maxDeprecatedUrl]));
+    if (requestedVersion <= maxDeprecated) {
+        await Lifecycle.getInstance().emitWarning(messages.getMessage('flags.apiVersion.warning.deprecated', [maxDeprecated, maxDeprecatedUrl]));
     }
     return input;
 };