@pnp/cli-microsoft365 12.1.0-beta.ab87e08 → 12.1.0-beta.f55735f

package/dist/m365/spfx/commands/project/project-rename.js

@@ -1,25 +1,19 @@
-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 _SpfxProjectRenameCommand_instances, _SpfxProjectRenameCommand_initTelemetry, _SpfxProjectRenameCommand_initOptions;
 import fs from 'fs';
 import path from 'path';
 import { v4 } from 'uuid';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { CommandError } from '../../../../Command.js';
 import commands from '../../commands.js';
 import { BaseProjectCommand } from './base-project-command.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    newName: z.string().alias('n'),
+    generateNewId: z.boolean().optional()
+});
 class SpfxProjectRenameCommand extends BaseProjectCommand {
-    get name() {
-        return commands.PROJECT_RENAME;
-    }
-    get description() {
-        return 'Renames SharePoint Framework project';
-    }
     constructor() {
-        super();
-        _SpfxProjectRenameCommand_instances.add(this);
+        super(...arguments);
         this.generateNewId = () => {
             return v4();
         };
@@ -132,8 +126,15 @@ class SpfxProjectRenameCommand extends BaseProjectCommand {
                 }
             }
         };
-        __classPrivateFieldGet(this, _SpfxProjectRenameCommand_instances, "m", _SpfxProjectRenameCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpfxProjectRenameCommand_instances, "m", _SpfxProjectRenameCommand_initOptions).call(this);
+    }
+    get name() {
+        return commands.PROJECT_RENAME;
+    }
+    get description() {
+        return 'Renames SharePoint Framework project';
+    }
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         this.projectRootPath = this.getProjectRoot(process.cwd());
@@ -165,19 +166,6 @@ class SpfxProjectRenameCommand extends BaseProjectCommand {
         }
     }
 }
-_SpfxProjectRenameCommand_instances = new WeakSet(), _SpfxProjectRenameCommand_initTelemetry = function _SpfxProjectRenameCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            generateNewId: args.options.generateNewId
-        });
-    });
-}, _SpfxProjectRenameCommand_initOptions = function _SpfxProjectRenameCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --newName <newName>'
-    }, {
-        option: '--generateNewId'
-    });
-};
 SpfxProjectRenameCommand.ERROR_NO_PROJECT_ROOT_FOLDER = 1;
 export default new SpfxProjectRenameCommand();
 //# sourceMappingURL=project-rename.js.map

package/dist/m365/spfx/commands/project/project-upgrade.js

@@ -25,9 +25,6 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
     get description() {
         return 'Upgrades SharePoint Framework project to the specified version';
     }
-    get allowedOutputs() {
-        return ['json', 'text', 'md', 'tour'];
-    }
     get schema() {
         return options;
     }

package/dist/m365/spfx/commands/spfx-doctor.js

@@ -1,15 +1,26 @@
-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 _SpfxDoctorCommand_instances, _SpfxDoctorCommand_initTelemetry, _SpfxDoctorCommand_initOptions, _SpfxDoctorCommand_initValidators;
 import child_process from 'child_process';
 import { satisfies } from 'semver';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../Command.js';
 import { CheckStatus, formatting } from '../../../utils/formatting.js';
+import { zod } from '../../../utils/zod.js';
 import commands from '../commands.js';
 import { BaseProjectCommand } from './project/base-project-command.js';
 import { SharePointVersion, versions } from './SpfxCompatibilityMatrix.js';
+const environments = {
+    sp2016: 'sp2016',
+    sp2019: 'sp2019',
+    spo: 'spo'
+};
+const spfxVersions = Object.keys(versions);
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    env: zod.coercedEnum(environments).optional().alias('e'),
+    spfxVersion: z.enum(spfxVersions, {
+        error: `The specified version is not a supported SharePoint Framework version. Supported versions are ${spfxVersions.join(', ')}`
+    }).optional().alias('v'),
+    output: z.enum(['text', 'json']).optional().alias('o')
+});
 /**
  * Where to search for the particular npm package: only in the current project,
  * in global packages or both
@@ -29,8 +40,10 @@ var HandlePromise;
     HandlePromise[HandlePromise["Continue"] = 1] = "Continue";
 })(HandlePromise || (HandlePromise = {}));
 class SpfxDoctorCommand extends BaseProjectCommand {
-    get allowedOutputs() {
-        return ['text', 'json'];
+    constructor() {
+        super(...arguments);
+        this.output = '';
+        this.resultsObject = [];
     }
     get name() {
         return commands.DOCTOR;
@@ -38,14 +51,8 @@ class SpfxDoctorCommand extends BaseProjectCommand {
     get description() {
         return 'Verifies environment configuration for using the specific version of the SharePoint Framework';
     }
-    constructor() {
-        super();
-        _SpfxDoctorCommand_instances.add(this);
-        this.output = '';
-        this.resultsObject = [];
-        __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (!args.options.output) {
@@ -430,36 +437,5 @@ class SpfxDoctorCommand extends BaseProjectCommand {
         }
     }
 }
-_SpfxDoctorCommand_instances = new WeakSet(), _SpfxDoctorCommand_initTelemetry = function _SpfxDoctorCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            env: args.options.env,
-            spfxVersion: args.options.spfxVersion
-        });
-    });
-}, _SpfxDoctorCommand_initOptions = function _SpfxDoctorCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --env [env]',
-        autocomplete: ['sp2016', 'sp2019', 'spo']
-    }, {
-        option: '-v, --spfxVersion [spfxVersion]',
-        autocomplete: Object.keys(versions)
-    });
-}, _SpfxDoctorCommand_initValidators = function _SpfxDoctorCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.env) {
-            const sp = this.spVersionStringToEnum(args.options.env);
-            if (!sp) {
-                return `${args.options.env} is not a valid SharePoint version. Valid versions are sp2016, sp2019 or spo`;
-            }
-        }
-        if (args.options.spfxVersion) {
-            if (!versions[args.options.spfxVersion]) {
-                return `${args.options.spfxVersion} is not a supported SharePoint Framework version. Supported versions are ${Object.keys(versions).join(', ')}`;
-            }
-        }
-        return true;
-    });
-};
 export default new SpfxDoctorCommand();
 //# sourceMappingURL=spfx-doctor.js.map

package/dist/m365/viva/commands/connections/connections-app-create.js

@@ -1,16 +1,31 @@
-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 _VivaConnectionsAppCreateCommand_instances, _VivaConnectionsAppCreateCommand_initOptions, _VivaConnectionsAppCreateCommand_initValidators;
 import AdmZip from 'adm-zip';
 import fs from 'fs';
 import path from 'path';
 import { v4 } from 'uuid';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import AnonymousCommand from '../../../base/AnonymousCommand.js';
 import commands from '../../commands.js';
 import { spo } from '../../../../utils/spo.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    portalUrl: z.string(),
+    name: z.string().max(30, { message: 'App name must not exceed 30 characters' }),
+    description: z.string().max(80, { message: 'Description must not exceed 80 characters' }),
+    longDescription: z.string().max(4000, { message: 'Long description must not exceed 4000 characters' }),
+    privacyPolicyUrl: z.string().optional(),
+    termsOfUseUrl: z.string().optional(),
+    companyName: z.string(),
+    companyWebsiteUrl: z.string(),
+    coloredIconPath: z.string().refine(val => fs.existsSync(path.resolve(val)), {
+        error: e => `File ${path.resolve(e.input)} doesn't exist`
+    }),
+    outlineIconPath: z.string().refine(val => fs.existsSync(path.resolve(val)), {
+        error: e => `File ${path.resolve(e.input)} doesn't exist`
+    }),
+    accentColor: z.string().optional(),
+    force: z.boolean().optional()
+});
 class VivaConnectionsAppCreateCommand extends AnonymousCommand {
     get name() {
         return commands.CONNECTIONS_APP_CREATE;
@@ -18,11 +33,20 @@ class VivaConnectionsAppCreateCommand extends AnonymousCommand {
     get description() {
         return 'Creates Viva Connections app';
     }
-    constructor() {
-        super();
-        _VivaConnectionsAppCreateCommand_instances.add(this);
-        __classPrivateFieldGet(this, _VivaConnectionsAppCreateCommand_instances, "m", _VivaConnectionsAppCreateCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _VivaConnectionsAppCreateCommand_instances, "m", _VivaConnectionsAppCreateCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .superRefine((opts, ctx) => {
+            const appFilePath = path.resolve(`${opts.name}.zip`);
+            if (fs.existsSync(appFilePath) && !opts.force) {
+                ctx.addIssue({
+                    message: `File ${path.resolve(`${opts.name}.zip`)} already exists. Delete the file or use the --force option to overwrite the existing file`,
+                    code: z.ZodIssueCode.custom
+                });
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -133,40 +157,10 @@ class VivaConnectionsAppCreateCommand extends AnonymousCommand {
     }
     async getWeb(args, logger) {
         if (this.verbose) {
-            await logger.logToStderr(`Checking if site ${args.options.url} exists...`);
+            await logger.logToStderr(`Checking if site ${args.options.portalUrl} exists...`);
         }
         return await spo.getWeb(args.options.portalUrl, logger, this.verbose);
     }
 }
-_VivaConnectionsAppCreateCommand_instances = new WeakSet(), _VivaConnectionsAppCreateCommand_initOptions = function _VivaConnectionsAppCreateCommand_initOptions() {
-    this.options.unshift({ option: '--portalUrl <portalUrl>' }, { option: '--name <name>' }, { option: '--description <description>' }, { option: '--longDescription <longDescription>' }, { option: '--privacyPolicyUrl [privacyPolicyUrl]' }, { option: '--termsOfUseUrl [termsOfUseUrl]' }, { option: '--companyName <companyName>' }, { option: '--companyWebsiteUrl <companyWebsiteUrl>' }, { option: '--coloredIconPath <coloredIconPath>' }, { option: '--outlineIconPath <outlineIconPath>' }, { option: '--accentColor [accentColor]' }, { option: '--force' });
-}, _VivaConnectionsAppCreateCommand_initValidators = function _VivaConnectionsAppCreateCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.name.length > 30) {
-            return `App name must not exceed 30 characters`;
-        }
-        if (args.options.description &&
-            args.options.description.length > 80) {
-            return 'Description must not exceed 80 characters';
-        }
-        if (args.options.longDescription &&
-            args.options.longDescription.length > 4000) {
-            return 'Long description must not exceed 4000 characters';
-        }
-        const appFilePath = path.resolve(`${args.options.name}.zip`);
-        if (fs.existsSync(appFilePath) && !args.options.force) {
-            return `File ${appFilePath} already exists. Delete the file or use the --force option to overwrite the existing file`;
-        }
-        const coloredIconPath = path.resolve(args.options.coloredIconPath);
-        if (!fs.existsSync(coloredIconPath)) {
-            return `File ${coloredIconPath} doesn't exist`;
-        }
-        const outlineIconPath = path.resolve(args.options.outlineIconPath);
-        if (!fs.existsSync(outlineIconPath)) {
-            return `File ${outlineIconPath} doesn't exist`;
-        }
-        return true;
-    });
-};
 export default new VivaConnectionsAppCreateCommand();
 //# sourceMappingURL=connections-app-create.js.map

package/dist/m365/viva/commands/engage/engage-community-add.js

@@ -1,11 +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 _VivaEngageCommunityAddCommand_instances, _VivaEngageCommunityAddCommand_initTelemetry, _VivaEngageCommunityAddCommand_initOptions, _VivaEngageCommunityAddCommand_initValidators, _VivaEngageCommunityAddCommand_initTypes, _VivaEngageCommunityAddCommand_initOptionSets;
-import GraphCommand from '../../../base/GraphCommand.js';
-import commands from '../../commands.js';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import { accessToken } from '../../../../utils/accessToken.js';
@@ -13,23 +7,86 @@ import auth from '../../../../Auth.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { entraUser } from '../../../../utils/entraUser.js';
 import { setTimeout } from 'timers/promises';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    displayName: z.string(),
+    description: z.string(),
+    privacy: z.enum(['public', 'private']),
+    adminEntraIds: z.string().optional(),
+    adminEntraUserNames: z.string().optional(),
+    wait: z.boolean().optional()
+});
 class VivaEngageCommunityAddCommand extends GraphCommand {
+    constructor() {
+        super(...arguments);
+        this.pollingInterval = 5000;
+    }
     get name() {
         return commands.ENGAGE_COMMUNITY_ADD;
     }
     get description() {
         return 'Creates a new community in Viva Engage';
     }
-    constructor() {
-        super();
-        _VivaEngageCommunityAddCommand_instances.add(this);
-        this.pollingInterval = 5000;
-        this.privacyOptions = ['public', 'private'];
-        __classPrivateFieldGet(this, _VivaEngageCommunityAddCommand_instances, "m", _VivaEngageCommunityAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _VivaEngageCommunityAddCommand_instances, "m", _VivaEngageCommunityAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _VivaEngageCommunityAddCommand_instances, "m", _VivaEngageCommunityAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _VivaEngageCommunityAddCommand_instances, "m", _VivaEngageCommunityAddCommand_initTypes).call(this);
-        __classPrivateFieldGet(this, _VivaEngageCommunityAddCommand_instances, "m", _VivaEngageCommunityAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => opts.displayName.length <= 255, {
+            message: `The maximum amount of characters for 'displayName' is 255.`
+        })
+            .refine(opts => opts.description.length <= 1024, {
+            message: `The maximum amount of characters for 'description' is 1024.`
+        })
+            .superRefine((opts, ctx) => {
+            if (opts.adminEntraIds) {
+                const items = opts.adminEntraIds.split(',').map(s => s.trim());
+                const invalid = items.filter(item => !validation.isValidGuid(item));
+                if (invalid.length > 0) {
+                    ctx.addIssue({
+                        code: z.ZodIssueCode.custom,
+                        message: `The following GUIDs are invalid for the option 'adminEntraIds': ${invalid.join(', ')}`
+                    });
+                }
+            }
+        })
+            .refine(opts => {
+            if (!opts.adminEntraIds) {
+                return true;
+            }
+            return formatting.splitAndTrim(opts.adminEntraIds).length <= 20;
+        }, {
+            message: 'Maximum of 20 admins allowed. Please reduce the number of users and try again.'
+        })
+            .superRefine((opts, ctx) => {
+            if (opts.adminEntraUserNames) {
+                const items = opts.adminEntraUserNames.split(',').map(s => s.trim());
+                const invalid = items.filter(item => !validation.isValidUserPrincipalName(item));
+                if (invalid.length > 0) {
+                    ctx.addIssue({
+                        code: z.ZodIssueCode.custom,
+                        message: `The following user principal names are invalid for the option 'adminEntraUserNames': ${invalid.join(', ')}`
+                    });
+                }
+            }
+        })
+            .refine(opts => {
+            if (!opts.adminEntraUserNames) {
+                return true;
+            }
+            return formatting.splitAndTrim(opts.adminEntraUserNames).length <= 20;
+        }, {
+            message: 'Maximum of 20 admins allowed. Please reduce the number of users and try again.'
+        })
+            .refine(opts => !opts.adminEntraIds || !opts.adminEntraUserNames, {
+            message: 'Specify either adminEntraIds or adminEntraUserNames, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['adminEntraIds', 'adminEntraUserNames']
+            }
+        });
     }
     async commandAction(logger, args) {
         const { displayName, description, privacy, adminEntraIds, adminEntraUserNames, wait } = args.options;
@@ -109,58 +166,5 @@ class VivaEngageCommunityAddCommand extends GraphCommand {
         return graphUserUrls;
     }
 }
-_VivaEngageCommunityAddCommand_instances = new WeakSet(), _VivaEngageCommunityAddCommand_initTelemetry = function _VivaEngageCommunityAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            adminEntraIds: typeof args.options.adminEntraIds !== 'undefined',
-            adminEntraUserNames: typeof args.options.adminEntraUserNames !== 'undefined',
-            wait: !!args.options.wait
-        });
-    });
-}, _VivaEngageCommunityAddCommand_initOptions = function _VivaEngageCommunityAddCommand_initOptions() {
-    this.options.unshift({ option: '--displayName <displayName>' }, { option: '--description <description>' }, {
-        option: '--privacy <privacy>',
-        autocomplete: this.privacyOptions
-    }, { option: '--adminEntraIds [adminEntraIds]' }, { option: '--adminEntraUserNames [adminEntraUserNames]' }, { option: '--wait' });
-}, _VivaEngageCommunityAddCommand_initValidators = function _VivaEngageCommunityAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.displayName.length > 255) {
-            return `The maximum amount of characters for 'displayName' is 255.`;
-        }
-        if (args.options.description.length > 1024) {
-            return `The maximum amount of characters for 'description' is 1024.`;
-        }
-        if (this.privacyOptions.indexOf(args.options.privacy) === -1) {
-            return `'${args.options.privacy}' is not a valid value for privacy. Allowed values are: ${this.privacyOptions.join(', ')}.`;
-        }
-        if (args.options.adminEntraIds) {
-            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.adminEntraIds);
-            if (isValidGUIDArrayResult !== true) {
-                return `The following GUIDs are invalid for the option 'adminEntraIds': ${isValidGUIDArrayResult}.`;
-            }
-            if (formatting.splitAndTrim(args.options.adminEntraIds).length > 20) {
-                return `Maximum of 20 admins allowed. Please reduce the number of users and try again.`;
-            }
-        }
-        if (args.options.adminEntraUserNames) {
-            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.adminEntraUserNames);
-            if (isValidUPNArrayResult !== true) {
-                return `The following user principal names are invalid for the option 'adminEntraUserNames': ${isValidUPNArrayResult}.`;
-            }
-            if (formatting.splitAndTrim(args.options.adminEntraUserNames).length > 20) {
-                return `Maximum of 20 admins allowed. Please reduce the number of users and try again.`;
-            }
-        }
-        return true;
-    });
-}, _VivaEngageCommunityAddCommand_initTypes = function _VivaEngageCommunityAddCommand_initTypes() {
-    this.types.string.push('displayName', 'description', 'privacy', 'adminEntraIds', 'adminEntraUserNames');
-    this.types.boolean.push('wait');
-}, _VivaEngageCommunityAddCommand_initOptionSets = function _VivaEngageCommunityAddCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['adminEntraIds', 'adminEntraUserNames'],
-        runsWhen: (args) => args.options.adminEntraIds || args.options.adminEntraUserNames
-    });
-};
 export default new VivaEngageCommunityAddCommand();
 //# sourceMappingURL=engage-community-add.js.map

package/dist/m365/viva/commands/engage/engage-community-get.js

@@ -1,12 +1,12 @@
-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 _VivaEngageCommunityGetCommand_instances, _VivaEngageCommunityGetCommand_initOptions, _VivaEngageCommunityGetCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import request from '../../../../request.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().alias('i')
+});
 class VivaEngageCommunityGetCommand extends GraphCommand {
     get name() {
         return commands.ENGAGE_COMMUNITY_GET;
@@ -14,11 +14,8 @@ class VivaEngageCommunityGetCommand extends GraphCommand {
     get description() {
         return 'Gets information of a Viva Engage community';
     }
-    constructor() {
-        super();
-        _VivaEngageCommunityGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _VivaEngageCommunityGetCommand_instances, "m", _VivaEngageCommunityGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _VivaEngageCommunityGetCommand_instances, "m", _VivaEngageCommunityGetCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -40,10 +37,5 @@ class VivaEngageCommunityGetCommand extends GraphCommand {
         }
     }
 }
-_VivaEngageCommunityGetCommand_instances = new WeakSet(), _VivaEngageCommunityGetCommand_initOptions = function _VivaEngageCommunityGetCommand_initOptions() {
-    this.options.unshift({ option: '-i, --id <id>' });
-}, _VivaEngageCommunityGetCommand_initTypes = function _VivaEngageCommunityGetCommand_initTypes() {
-    this.types.string.push('id');
-};
 export default new VivaEngageCommunityGetCommand();
 //# sourceMappingURL=engage-community-get.js.map

package/dist/m365/viva/commands/engage/engage-community-list.js

@@ -1,6 +1,8 @@
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = globalOptionsZod.strict();
 class VivaEngageCommunityListCommand extends GraphCommand {
     get name() {
         return commands.ENGAGE_COMMUNITY_LIST;
@@ -11,6 +13,9 @@ class VivaEngageCommunityListCommand extends GraphCommand {
     defaultProperties() {
         return ['id', 'displayName', 'privacy'];
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         if (this.verbose) {
             await logger.logToStderr('Getting all Viva Engage communities...');

package/dist/m365/viva/commands/engage/engage-community-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 _VivaEngageCommunityRemoveCommand_instances, _VivaEngageCommunityRemoveCommand_initTelemetry, _VivaEngageCommunityRemoveCommand_initOptions, _VivaEngageCommunityRemoveCommand_initValidators, _VivaEngageCommunityRemoveCommand_initOptionSets, _VivaEngageCommunityRemoveCommand_initTypes;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
-import { validation } from '../../../../utils/validation.js';
 import { vivaEngage } from '../../../../utils/vivaEngage.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().optional().alias('i'),
+    displayName: z.string().optional().alias('n'),
+    entraGroupId: z.guid().optional(),
+    force: z.boolean().optional().alias('f')
+});
 class VivaEngageCommunityRemoveCommand extends GraphCommand {
     get name() {
         return commands.ENGAGE_COMMUNITY_REMOVE;
@@ -17,14 +19,25 @@ class VivaEngageCommunityRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes a Viva Engage community';
     }
-    constructor() {
-        super();
-        _VivaEngageCommunityRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _VivaEngageCommunityRemoveCommand_instances, "m", _VivaEngageCommunityRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _VivaEngageCommunityRemoveCommand_instances, "m", _VivaEngageCommunityRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _VivaEngageCommunityRemoveCommand_instances, "m", _VivaEngageCommunityRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _VivaEngageCommunityRemoveCommand_instances, "m", _VivaEngageCommunityRemoveCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _VivaEngageCommunityRemoveCommand_instances, "m", _VivaEngageCommunityRemoveCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.displayName, opts.entraGroupId].some(x => x !== undefined), {
+            message: 'Specify either id, displayName, or entraGroupId.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName', 'entraGroupId']
+            }
+        })
+            .refine(opts => [opts.id, opts.displayName, opts.entraGroupId].filter(x => x !== undefined).length <= 1, {
+            message: 'Specify either id, displayName, or entraGroupId, but not multiple.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName', 'entraGroupId']
+            }
+        });
     }
     async commandAction(logger, args) {
         const removeCommunity = async () => {
@@ -62,38 +75,5 @@ class VivaEngageCommunityRemoveCommand extends GraphCommand {
         }
     }
 }
-_VivaEngageCommunityRemoveCommand_instances = new WeakSet(), _VivaEngageCommunityRemoveCommand_initTelemetry = function _VivaEngageCommunityRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: args.options.id !== 'undefined',
-            displayName: args.options.displayName !== 'undefined',
-            entraGroupId: args.options.entraGroupId !== 'undefined',
-            force: !!args.options.force
-        });
-    });
-}, _VivaEngageCommunityRemoveCommand_initOptions = function _VivaEngageCommunityRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --displayName [displayName]'
-    }, {
-        option: '--entraGroupId [entraGroupId]'
-    }, {
-        option: '-f, --force'
-    });
-}, _VivaEngageCommunityRemoveCommand_initValidators = function _VivaEngageCommunityRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.entraGroupId && !validation.isValidGuid(args.options.entraGroupId)) {
-            return `${args.options.entraGroupId} is not a valid GUID for the option 'entraGroupId'.`;
-        }
-        return true;
-    });
-}, _VivaEngageCommunityRemoveCommand_initOptionSets = function _VivaEngageCommunityRemoveCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['id', 'displayName', 'entraGroupId']
-    });
-}, _VivaEngageCommunityRemoveCommand_initTypes = function _VivaEngageCommunityRemoveCommand_initTypes() {
-    this.types.string.push('id', 'displayName', 'entraGroupId');
-};
 export default new VivaEngageCommunityRemoveCommand();
 //# sourceMappingURL=engage-community-remove.js.map