@pnp/cli-microsoft365 11.9.0-beta.8c1ee05 → 11.9.0-beta.9bd71dd

package/dist/m365/flow/commands/flow-export.js

@@ -1,17 +1,25 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _FlowExportCommand_instances, _FlowExportCommand_initTelemetry, _FlowExportCommand_initOptions, _FlowExportCommand_initValidators;
 import fs from 'fs';
 import path from 'path';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../Command.js';
 import request from '../../../request.js';
 import { formatting } from '../../../utils/formatting.js';
-import { validation } from '../../../utils/validation.js';
 import PowerPlatformCommand from '../../base/PowerPlatformCommand.js';
 import commands from '../commands.js';
 import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    environmentName: z.string().alias('e'),
+    name: z.uuid().alias('n'),
+    packageDisplayName: z.string().optional().alias('d'),
+    packageDescription: z.string().optional(),
+    packageCreatedBy: z.string().optional().alias('c'),
+    packageSourceEnvironment: z.string().optional().alias('s'),
+    format: z.string().transform(v => v.toLowerCase()).pipe(z.enum(['json', 'zip'], {
+        error: 'Option format must be json or zip. Default is zip'
+    })).optional().alias('f'),
+    path: z.string().optional().alias('p')
+});
 class FlowExportCommand extends PowerPlatformCommand {
     get name() {
         return commands.EXPORT;
@@ -19,12 +27,36 @@ class FlowExportCommand extends PowerPlatformCommand {
     get description() {
         return 'Exports the specified Microsoft Flow as a file';
     }
-    constructor() {
-        super();
-        _FlowExportCommand_instances.add(this);
-        __classPrivateFieldGet(this, _FlowExportCommand_instances, "m", _FlowExportCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _FlowExportCommand_instances, "m", _FlowExportCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _FlowExportCommand_instances, "m", _FlowExportCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => options.format !== 'json' || !options.packageCreatedBy, {
+            error: 'packageCreatedBy cannot be specified with output of json',
+            path: ['packageCreatedBy']
+        })
+            .refine(options => options.format !== 'json' || !options.packageDescription, {
+            error: 'packageDescription cannot be specified with output of json',
+            path: ['packageDescription']
+        })
+            .refine(options => options.format !== 'json' || !options.packageDisplayName, {
+            error: 'packageDisplayName cannot be specified with output of json',
+            path: ['packageDisplayName']
+        })
+            .refine(options => options.format !== 'json' || !options.packageSourceEnvironment, {
+            error: 'packageSourceEnvironment cannot be specified with output of json',
+            path: ['packageSourceEnvironment']
+        })
+            .refine(options => {
+            if (options.path) {
+                return fs.existsSync(path.dirname(options.path));
+            }
+            return true;
+        }, {
+            error: 'Specified path where to save the file does not exist',
+            path: ['path']
+        });
     }
     async commandAction(logger, args) {
         const formatArgument = args.options.format?.toLowerCase() || '';
@@ -139,63 +171,5 @@ class FlowExportCommand extends PowerPlatformCommand {
         }
     }
 }
-_FlowExportCommand_instances = new WeakSet(), _FlowExportCommand_initTelemetry = function _FlowExportCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            packageDisplayName: typeof args.options.packageDisplayName !== 'undefined',
-            packageDescription: typeof args.options.packageDescription !== 'undefined',
-            packageCreatedBy: typeof args.options.packageCreatedBy !== 'undefined',
-            packageSourceEnvironment: typeof args.options.packageSourceEnvironment !== 'undefined',
-            format: args.options.format,
-            path: typeof args.options.path !== 'undefined'
-        });
-    });
-}, _FlowExportCommand_initOptions = function _FlowExportCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name <name>'
-    }, {
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '-d, --packageDisplayName [packageDisplayName]'
-    }, {
-        option: '--packageDescription [packageDescription]'
-    }, {
-        option: '-c, --packageCreatedBy [packageCreatedBy]'
-    }, {
-        option: '-s, --packageSourceEnvironment [packageSourceEnvironment]'
-    }, {
-        option: '-f, --format [format]'
-    }, {
-        option: '-p, --path [path]'
-    });
-}, _FlowExportCommand_initValidators = function _FlowExportCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const lowerCaseFormat = args.options.format ? args.options.format.toLowerCase() : '';
-        if (!validation.isValidGuid(args.options.name)) {
-            return `${args.options.name} is not a valid GUID`;
-        }
-        if (args.options.format && (lowerCaseFormat !== 'json' && lowerCaseFormat !== 'zip')) {
-            return 'Option format must be json or zip. Default is zip';
-        }
-        if (lowerCaseFormat === 'json') {
-            if (args.options.packageCreatedBy) {
-                return 'packageCreatedBy cannot be specified with output of json';
-            }
-            if (args.options.packageDescription) {
-                return 'packageDescription cannot be specified with output of json';
-            }
-            if (args.options.packageDisplayName) {
-                return 'packageDisplayName cannot be specified with output of json';
-            }
-            if (args.options.packageSourceEnvironment) {
-                return 'packageSourceEnvironment cannot be specified with output of json';
-            }
-        }
-        if (args.options.path && !fs.existsSync(path.dirname(args.options.path))) {
-            return 'Specified path where to save the file does not exist';
-        }
-        return true;
-    });
-};
 export default new FlowExportCommand();
 //# sourceMappingURL=flow-export.js.map

package/dist/m365/flow/commands/flow-get.js

@@ -1,13 +1,15 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _FlowGetCommand_instances, _FlowGetCommand_initTelemetry, _FlowGetCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../Command.js';
 import request from '../../../request.js';
 import { formatting } from '../../../utils/formatting.js';
 import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
 import commands from '../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    environmentName: z.string().alias('e'),
+    name: z.string().alias('n'),
+    asAdmin: z.boolean().optional()
+});
 class FlowGetCommand extends PowerAutomateCommand {
     get name() {
         return commands.GET;
@@ -15,11 +17,8 @@ class FlowGetCommand extends PowerAutomateCommand {
     get description() {
         return 'Gets information about the specified Microsoft Flow';
     }
-    constructor() {
-        super();
-        _FlowGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _FlowGetCommand_instances, "m", _FlowGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _FlowGetCommand_instances, "m", _FlowGetCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -45,20 +44,5 @@ class FlowGetCommand extends PowerAutomateCommand {
         }
     }
 }
-_FlowGetCommand_instances = new WeakSet(), _FlowGetCommand_initTelemetry = function _FlowGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            asAdmin: !!args.options.asAdmin
-        });
-    });
-}, _FlowGetCommand_initOptions = function _FlowGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name <name>'
-    }, {
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '--asAdmin'
-    });
-};
 export default new FlowGetCommand();
 //# sourceMappingURL=flow-get.js.map

package/dist/m365/flow/commands/flow-list.js

@@ -1,13 +1,16 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _FlowListCommand_instances, _FlowListCommand_initTelemetry, _FlowListCommand_initOptions, _FlowListCommand_initValidators, _FlowListCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../Command.js';
 import { formatting } from '../../../utils/formatting.js';
 import { odata } from '../../../utils/odata.js';
 import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
 import commands from '../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    environmentName: z.string().alias('e'),
+    sharingStatus: z.enum(['all', 'personal', 'ownedByMe', 'sharedWithMe']).optional(),
+    withSolutions: z.boolean().optional(),
+    asAdmin: z.boolean().optional()
+});
 class FlowListCommand extends PowerAutomateCommand {
     get name() {
         return commands.LIST;
@@ -15,18 +18,17 @@ class FlowListCommand extends PowerAutomateCommand {
     get description() {
         return 'Lists Power Automate flows in the given environment';
     }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema.refine(options => !(options.asAdmin && options.sharingStatus), {
+            error: 'The options asAdmin and sharingStatus cannot be specified together.'
+        });
+    }
     defaultProperties() {
         return ['name', 'displayName'];
     }
-    constructor() {
-        super();
-        _FlowListCommand_instances.add(this);
-        this.allowedSharingStatuses = ['all', 'personal', 'ownedByMe', 'sharedWithMe'];
-        __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initTypes).call(this);
-    }
     async commandAction(logger, args) {
         if (this.verbose) {
             await logger.logToStderr(`Getting Power Automate flows${args.options.asAdmin ? ' as admin' : ''} in environment '${args.options.environmentName}'...`);
@@ -76,38 +78,5 @@ class FlowListCommand extends PowerAutomateCommand {
         return `${baseEndpoint}${asAdmin ? adminSegment : environmentSegment}${flowsEndpoint}${filterQuery}${includeQuery}`;
     }
 }
-_FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = function _FlowListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            sharingStatus: typeof args.options.sharingStatus !== 'undefined',
-            withSolutions: !!args.options.withSolutions,
-            asAdmin: !!args.options.asAdmin
-        });
-    });
-}, _FlowListCommand_initOptions = function _FlowListCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '--sharingStatus [sharingStatus]',
-        autocomplete: this.allowedSharingStatuses
-    }, {
-        option: '--withSolutions'
-    }, {
-        option: '--asAdmin'
-    });
-}, _FlowListCommand_initValidators = function _FlowListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.asAdmin && args.options.sharingStatus) {
-            return `The options asAdmin and sharingStatus cannot be specified together.`;
-        }
-        if (args.options.sharingStatus && !this.allowedSharingStatuses.some(status => status === args.options.sharingStatus)) {
-            return `${args.options.sharingStatus} is not a valid sharing status. Allowed values are: ${this.allowedSharingStatuses.join(', ')}`;
-        }
-        return true;
-    });
-}, _FlowListCommand_initTypes = function _FlowListCommand_initTypes() {
-    this.types.string.push('environmentName', 'sharingStatus');
-    this.types.boolean.push('withSolutions', 'asAdmin');
-};
 export default new FlowListCommand();
 //# sourceMappingURL=flow-list.js.map

package/dist/m365/flow/commands/flow-remove.js

@@ -1,15 +1,17 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _FlowRemoveCommand_instances, _FlowRemoveCommand_initTelemetry, _FlowRemoveCommand_initOptions, _FlowRemoveCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../cli/cli.js';
+import { globalOptionsZod } from '../../../Command.js';
 import request from '../../../request.js';
 import { formatting } from '../../../utils/formatting.js';
-import { validation } from '../../../utils/validation.js';
 import commands from '../commands.js';
 import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    name: z.uuid().alias('n'),
+    environmentName: z.string().alias('e'),
+    asAdmin: z.boolean().optional(),
+    force: z.boolean().optional().alias('f')
+});
 class FlowRemoveCommand extends PowerAutomateCommand {
     get name() {
         return commands.REMOVE;
@@ -17,12 +19,8 @@ class FlowRemoveCommand extends PowerAutomateCommand {
     get description() {
         return 'Removes the specified Microsoft Flow';
     }
-    constructor() {
-        super();
-        _FlowRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _FlowRemoveCommand_instances, "m", _FlowRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _FlowRemoveCommand_instances, "m", _FlowRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _FlowRemoveCommand_instances, "m", _FlowRemoveCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -60,30 +58,5 @@ class FlowRemoveCommand extends PowerAutomateCommand {
         }
     }
 }
-_FlowRemoveCommand_instances = new WeakSet(), _FlowRemoveCommand_initTelemetry = function _FlowRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            asAdmin: !!args.options.asAdmin,
-            force: !!args.options.force
-        });
-    });
-}, _FlowRemoveCommand_initOptions = function _FlowRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name <name>'
-    }, {
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '--asAdmin'
-    }, {
-        option: '-f, --force'
-    });
-}, _FlowRemoveCommand_initValidators = function _FlowRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.name)) {
-            return `${args.options.name} is not a valid GUID`;
-        }
-        return true;
-    });
-};
 export default new FlowRemoveCommand();
 //# sourceMappingURL=flow-remove.js.map

package/dist/m365/flow/commands/owner/owner-ensure.js

@@ -1,9 +1,5 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _FlowOwnerEnsureCommand_instances, _a, _FlowOwnerEnsureCommand_initTelemetry, _FlowOwnerEnsureCommand_initOptions, _FlowOwnerEnsureCommand_initOptionSets, _FlowOwnerEnsureCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { entraUser } from '../../../../utils/entraUser.js';
@@ -11,6 +7,23 @@ import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    flowName: z.uuid(),
+    environmentName: z.string().alias('e'),
+    roleName: z.enum(['CanView', 'CanEdit']),
+    userId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    }).optional(),
+    userName: z.string().refine(name => validation.isValidUserPrincipalName(name), {
+        error: e => `'${e.input}' is not a valid userName.`
+    }).optional(),
+    groupId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    }).optional(),
+    groupName: z.string().optional(),
+    asAdmin: z.boolean().optional()
+});
 class FlowOwnerEnsureCommand extends PowerAutomateCommand {
     get name() {
         return commands.OWNER_ENSURE;
@@ -18,13 +31,17 @@ class FlowOwnerEnsureCommand extends PowerAutomateCommand {
     get description() {
         return 'Assigns/updates permissions to a Power Automate flow';
     }
-    constructor() {
-        super();
-        _FlowOwnerEnsureCommand_instances.add(this);
-        __classPrivateFieldGet(this, _FlowOwnerEnsureCommand_instances, "m", _FlowOwnerEnsureCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _FlowOwnerEnsureCommand_instances, "m", _FlowOwnerEnsureCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _FlowOwnerEnsureCommand_instances, "m", _FlowOwnerEnsureCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _FlowOwnerEnsureCommand_instances, "m", _FlowOwnerEnsureCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema.refine(options => [options.userId, options.userName, options.groupId, options.groupName].filter(x => x !== undefined).length === 1, {
+            error: 'Specify either userId, userName, groupId, or groupName, but not multiple.',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName', 'groupId', 'groupName']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -78,57 +95,5 @@ class FlowOwnerEnsureCommand extends PowerAutomateCommand {
         }
     }
 }
-_a = FlowOwnerEnsureCommand, _FlowOwnerEnsureCommand_instances = new WeakSet(), _FlowOwnerEnsureCommand_initTelemetry = function _FlowOwnerEnsureCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            asAdmin: !!args.options.asAdmin,
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            groupId: typeof args.options.groupId !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined'
-        });
-    });
-}, _FlowOwnerEnsureCommand_initOptions = function _FlowOwnerEnsureCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '--flowName <flowName>'
-    }, {
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    }, {
-        option: '--groupId [groupId]'
-    }, {
-        option: '--groupName [groupName]'
-    }, {
-        option: '--roleName <roleName>',
-        autocomplete: _a.allowedRoleNames
-    }, {
-        option: '--asAdmin'
-    });
-}, _FlowOwnerEnsureCommand_initOptionSets = function _FlowOwnerEnsureCommand_initOptionSets() {
-    this.optionSets.push({ options: ['userId', 'userName', 'groupId', 'groupName'] });
-}, _FlowOwnerEnsureCommand_initValidators = function _FlowOwnerEnsureCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.flowName)) {
-            return `${args.options.flowName} is not a valid GUID.`;
-        }
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID.`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userName} is not a valid userName.`;
-        }
-        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID.`;
-        }
-        if (_a.allowedRoleNames.indexOf(args.options.roleName) === -1) {
-            return `${args.options.roleName} is not a valid roleName. Valid values are: ${_a.allowedRoleNames.join(', ')}`;
-        }
-        return true;
-    });
-};
-FlowOwnerEnsureCommand.allowedRoleNames = ['CanView', 'CanEdit'];
 export default new FlowOwnerEnsureCommand();
 //# sourceMappingURL=owner-ensure.js.map

package/dist/m365/flow/commands/owner/owner-list.js

@@ -1,15 +1,16 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _FlowOwnerListCommand_instances, _FlowOwnerListCommand_initTelemetry, _FlowOwnerListCommand_initOptions, _FlowOwnerListCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
-import { validation } from '../../../../utils/validation.js';
 import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    flowName: z.uuid(),
+    environmentName: z.string().alias('e'),
+    asAdmin: z.boolean().optional()
+});
 class FlowOwnerListCommand extends PowerAutomateCommand {
     get name() {
         return commands.OWNER_LIST;
@@ -20,12 +21,8 @@ class FlowOwnerListCommand extends PowerAutomateCommand {
     defaultProperties() {
         return ['roleName', 'id', 'type'];
     }
-    constructor() {
-        super();
-        _FlowOwnerListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _FlowOwnerListCommand_instances, "m", _FlowOwnerListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _FlowOwnerListCommand_instances, "m", _FlowOwnerListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _FlowOwnerListCommand_instances, "m", _FlowOwnerListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -50,27 +47,5 @@ class FlowOwnerListCommand extends PowerAutomateCommand {
         }
     }
 }
-_FlowOwnerListCommand_instances = new WeakSet(), _FlowOwnerListCommand_initTelemetry = function _FlowOwnerListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            asAdmin: !!args.options.asAdmin
-        });
-    });
-}, _FlowOwnerListCommand_initOptions = function _FlowOwnerListCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '--flowName <flowName>'
-    }, {
-        option: '--asAdmin'
-    });
-}, _FlowOwnerListCommand_initValidators = function _FlowOwnerListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.flowName)) {
-            return `${args.options.flowName} is not a valid GUID.`;
-        }
-        return true;
-    });
-};
 export default new FlowOwnerListCommand();
 //# sourceMappingURL=owner-list.js.map

package/dist/m365/flow/commands/owner/owner-remove.js

@@ -1,10 +1,6 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _FlowOwnerRemoveCommand_instances, _FlowOwnerRemoveCommand_initTelemetry, _FlowOwnerRemoveCommand_initOptions, _FlowOwnerRemoveCommand_initValidators, _FlowOwnerRemoveCommand_initOptionSets;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { entraUser } from '../../../../utils/entraUser.js';
@@ -12,6 +8,23 @@ import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    flowName: z.uuid(),
+    environmentName: z.string().alias('e'),
+    userId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    }).optional(),
+    userName: z.string().refine(name => validation.isValidUserPrincipalName(name), {
+        error: e => `'${e.input}' is not a valid userName.`
+    }).optional(),
+    groupId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    }).optional(),
+    groupName: z.string().optional(),
+    asAdmin: z.boolean().optional(),
+    force: z.boolean().optional().alias('f')
+});
 class FlowOwnerRemoveCommand extends PowerAutomateCommand {
     get name() {
         return commands.OWNER_REMOVE;
@@ -19,13 +32,17 @@ class FlowOwnerRemoveCommand extends PowerAutomateCommand {
     get description() {
         return 'Removes owner permissions to a Power Automate flow';
     }
-    constructor() {
-        super();
-        _FlowOwnerRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _FlowOwnerRemoveCommand_instances, "m", _FlowOwnerRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _FlowOwnerRemoveCommand_instances, "m", _FlowOwnerRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _FlowOwnerRemoveCommand_instances, "m", _FlowOwnerRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _FlowOwnerRemoveCommand_instances, "m", _FlowOwnerRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema.refine(options => [options.userId, options.userName, options.groupId, options.groupName].filter(x => x !== undefined).length === 1, {
+            error: 'Specify either userId, userName, groupId, or groupName, but not multiple.',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName', 'groupId', 'groupName']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -77,53 +94,5 @@ class FlowOwnerRemoveCommand extends PowerAutomateCommand {
         }
     }
 }
-_FlowOwnerRemoveCommand_instances = new WeakSet(), _FlowOwnerRemoveCommand_initTelemetry = function _FlowOwnerRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            groupId: typeof args.options.groupId !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined',
-            asAdmin: !!args.options.asAdmin,
-            force: !!args.options.force
-        });
-    });
-}, _FlowOwnerRemoveCommand_initOptions = function _FlowOwnerRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '--flowName <flowName>'
-    }, {
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    }, {
-        option: '--groupId [groupId]'
-    }, {
-        option: '--groupName [groupName]'
-    }, {
-        option: '--asAdmin'
-    }, {
-        option: '-f, --force'
-    });
-}, _FlowOwnerRemoveCommand_initValidators = function _FlowOwnerRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.flowName)) {
-            return `${args.options.flowName} is not a valid GUID.`;
-        }
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID.`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userName} is not a valid userName.`;
-        }
-        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID.`;
-        }
-        return true;
-    });
-}, _FlowOwnerRemoveCommand_initOptionSets = function _FlowOwnerRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['userId', 'userName', 'groupId', 'groupName'] });
-};
 export default new FlowOwnerRemoveCommand();
 //# sourceMappingURL=owner-remove.js.map