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

package/dist/m365/viva/commands/engage/engage-report-activityuserdetail.js

@@ -1,5 +1,6 @@
-import DateAndPeriodBasedReport from '../../../base/DateAndPeriodBasedReport.js';
+import DateAndPeriodBasedReport, { dateAndPeriodBasedReportOptions } from '../../../base/DateAndPeriodBasedReport.js';
 import commands from '../../commands.js';
+export const options = dateAndPeriodBasedReportOptions;
 class VivaEngageReportActivityUserDetailCommand extends DateAndPeriodBasedReport {
     get name() {
         return commands.ENGAGE_REPORT_ACTIVITYUSERDETAIL;

package/dist/m365/viva/commands/engage/engage-report-deviceusagedistributionusercounts.js

@@ -1,5 +1,6 @@
-import PeriodBasedReport from '../../../base/PeriodBasedReport.js';
+import PeriodBasedReport, { periodBasedReportOptions } from '../../../base/PeriodBasedReport.js';
 import commands from '../../commands.js';
+export const options = periodBasedReportOptions;
 class VivaEngageReportDeviceUsageDistributionUserCountsCommand extends PeriodBasedReport {
     get name() {
         return commands.ENGAGE_REPORT_DEVICEUSAGEDISTRIBUTIONUSERCOUNTS;

package/dist/m365/viva/commands/engage/engage-report-deviceusageusercounts.js

@@ -1,5 +1,6 @@
-import PeriodBasedReport from '../../../base/PeriodBasedReport.js';
+import PeriodBasedReport, { periodBasedReportOptions } from '../../../base/PeriodBasedReport.js';
 import commands from '../../commands.js';
+export const options = periodBasedReportOptions;
 class VivaEngageReportDeviceUsageUserCountsCommand extends PeriodBasedReport {
     get name() {
         return commands.ENGAGE_REPORT_DEVICEUSAGEUSERCOUNTS;

package/dist/m365/viva/commands/engage/engage-report-deviceusageuserdetail.js

@@ -1,5 +1,6 @@
-import DateAndPeriodBasedReport from '../../../base/DateAndPeriodBasedReport.js';
+import DateAndPeriodBasedReport, { dateAndPeriodBasedReportOptions } from '../../../base/DateAndPeriodBasedReport.js';
 import commands from '../../commands.js';
+export const options = dateAndPeriodBasedReportOptions;
 class VivaEngageReportDeviceUsageUserDetailCommand extends DateAndPeriodBasedReport {
     get name() {
         return commands.ENGAGE_REPORT_DEVICEUSAGEUSERDETAIL;

package/dist/m365/viva/commands/engage/engage-report-groupsactivitycounts.js

@@ -1,5 +1,6 @@
-import PeriodBasedReport from '../../../base/PeriodBasedReport.js';
+import PeriodBasedReport, { periodBasedReportOptions } from '../../../base/PeriodBasedReport.js';
 import commands from '../../commands.js';
+export const options = periodBasedReportOptions;
 class VivaEngageReportGroupsActivityCountsCommand extends PeriodBasedReport {
     get name() {
         return commands.ENGAGE_REPORT_GROUPSACTIVITYCOUNTS;

package/dist/m365/viva/commands/engage/engage-report-groupsactivitydetail.js

@@ -1,5 +1,6 @@
-import DateAndPeriodBasedReport from '../../../base/DateAndPeriodBasedReport.js';
+import DateAndPeriodBasedReport, { dateAndPeriodBasedReportOptions } from '../../../base/DateAndPeriodBasedReport.js';
 import commands from '../../commands.js';
+export const options = dateAndPeriodBasedReportOptions;
 class VivaEngageReportGroupsActivityDetailCommand extends DateAndPeriodBasedReport {
     get name() {
         return commands.ENGAGE_REPORT_GROUPSACTIVITYDETAIL;

package/dist/m365/viva/commands/engage/engage-report-groupsactivitygroupcounts.js

@@ -1,5 +1,6 @@
-import PeriodBasedReport from '../../../base/PeriodBasedReport.js';
+import PeriodBasedReport, { periodBasedReportOptions } from '../../../base/PeriodBasedReport.js';
 import commands from '../../commands.js';
+export const options = periodBasedReportOptions;
 class VivaEngageReportGroupsActivityGroupCountsCommand extends PeriodBasedReport {
     get name() {
         return commands.ENGAGE_REPORT_GROUPSACTIVITYGROUPCOUNTS;

package/dist/m365/viva/commands/engage/engage-role-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 VivaEngageRoleListCommand extends GraphCommand {
     get name() {
         return commands.ENGAGE_ROLE_LIST;
@@ -11,6 +13,9 @@ class VivaEngageRoleListCommand extends GraphCommand {
     defaultProperties() {
         return ['id', 'displayName'];
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         if (this.verbose) {
             await logger.logToStderr('Getting all Viva Engage roles...');

package/dist/m365/viva/commands/engage/engage-role-member-add.js

@@ -8,13 +8,11 @@ import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 export const options = z.strictObject({
     ...globalOptionsZod.shape,
-    roleId: z.uuid().optional().refine(id => validation.isValidGuid(id), {
-        error: e => `'${e.input}' is not a valid GUID.`
-    }),
+    roleId: z.guid().optional(),
     roleName: z.string().optional(),
-    userId: z.uuid().optional().refine(id => validation.isValidGuid(id), {
+    userId: z.string().refine(id => validation.isValidGuid(id), {
         error: e => `'${e.input}' is not a valid GUID.`
-    }),
+    }).optional(),
     userName: z.string().refine(upn => validation.isValidUserPrincipalName(upn), {
         error: e => `'${e.input}' is not a valid UPN.`
     }).optional()

package/dist/m365/viva/commands/engage/engage-role-member-list.js

@@ -6,7 +6,7 @@ import commands from '../../commands.js';
 import { vivaEngage } from '../../../../utils/vivaEngage.js';
 export const options = z.strictObject({
     ...globalOptionsZod.shape,
-    roleId: z.uuid().optional().alias('i'),
+    roleId: z.guid().optional().alias('i'),
     roleName: z.string().optional().alias('n')
 });
 class VivaEngageRoleMemberListCommand extends GraphCommand {

package/dist/m365/viva/commands/engage/engage-role-member-remove.js

@@ -9,9 +9,11 @@ import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 export const options = z.strictObject({
     ...globalOptionsZod.shape,
-    roleId: z.uuid().optional(),
+    roleId: z.guid().optional(),
     roleName: z.string().optional(),
-    userId: z.uuid().optional(),
+    userId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    }).optional(),
     userName: z.string().refine(upn => validation.isValidUserPrincipalName(upn), {
         error: e => `'${e.input}' is not a valid UPN.`
     }).optional(),

package/dist/m365/viva/commands/engage/engage-search.js

@@ -1,14 +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 _VivaEngageSearchCommand_instances, _a, _VivaEngageSearchCommand_initTelemetry, _VivaEngageSearchCommand_initOptions, _VivaEngageSearchCommand_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 VivaEngageCommand from '../../../base/VivaEngageCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    queryText: z.string(),
+    show: z.enum(['summary', 'messages', 'users', 'topics', 'groups']).optional(),
+    limit: z.coerce.number().optional()
+});
 class VivaEngageSearchCommand extends VivaEngageCommand {
     get name() {
         return commands.ENGAGE_SEARCH;
@@ -16,22 +18,14 @@ class VivaEngageSearchCommand extends VivaEngageCommand {
     get description() {
         return 'Returns a list of messages, users, topics and groups that match the specified query.';
     }
-    constructor() {
-        super();
-        _VivaEngageSearchCommand_instances.add(this);
-        this.summary = {
-            messages: 0,
-            groups: 0,
-            topics: 0,
-            users: 0
-        };
-        this.messages = [];
-        this.groups = [];
-        this.topics = [];
-        this.users = [];
-        __classPrivateFieldGet(this, _VivaEngageSearchCommand_instances, "m", _VivaEngageSearchCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _VivaEngageSearchCommand_instances, "m", _VivaEngageSearchCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _VivaEngageSearchCommand_instances, "m", _VivaEngageSearchCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => opts.output !== 'json' || !opts.show, {
+            message: `show can't be used when --output set to json`
+        });
     }
     async getAllItems(logger, args, page) {
         const endpoint = `${this.resource}/v1/search.json?search=${formatting.encodeQueryParameter(args.options.queryText)}&page=${page}`;
@@ -169,48 +163,5 @@ class VivaEngageSearchCommand extends VivaEngageCommand {
         }
     }
 }
-_a = VivaEngageSearchCommand, _VivaEngageSearchCommand_instances = new WeakSet(), _VivaEngageSearchCommand_initTelemetry = function _VivaEngageSearchCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            show: typeof args.options.show !== 'undefined',
-            limit: typeof args.options.limit !== 'undefined'
-        });
-    });
-}, _VivaEngageSearchCommand_initOptions = function _VivaEngageSearchCommand_initOptions() {
-    this.options.unshift({
-        option: '--queryText <queryText>'
-    }, {
-        option: '--show [show]',
-        autocomplete: _a.showOptions
-    }, {
-        option: '--limit [limit]'
-    });
-}, _VivaEngageSearchCommand_initValidators = function _VivaEngageSearchCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.queryText && typeof args.options.queryText !== 'string') {
-            return `${args.options.queryText} is not a string`;
-        }
-        if (args.options.limit && typeof args.options.limit !== 'number') {
-            return `${args.options.limit} is not a number`;
-        }
-        if (args.options.output !== 'json') {
-            if (typeof args.options.show !== 'undefined') {
-                const scope = args.options.show.toString().toLowerCase();
-                if (_a.showOptions.indexOf(scope) < 0) {
-                    return `${scope} is not a valid value for show. Allowed values are ${_a.showOptions.join(', ')}`;
-                }
-            }
-        }
-        else {
-            if (typeof args.options.show !== 'undefined') {
-                return `${args.options.show} can't be used when --output set to json`;
-            }
-        }
-        return true;
-    });
-};
-VivaEngageSearchCommand.showOptions = [
-    'summary', 'messages', 'users', 'topics', 'groups'
-];
 export default new VivaEngageSearchCommand();
 //# sourceMappingURL=engage-search.js.map

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

@@ -1,13 +1,14 @@
-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 _VivaEngageUserGetCommand_instances, _VivaEngageUserGetCommand_initTelemetry, _VivaEngageUserGetCommand_initOptions, _VivaEngageUserGetCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import VivaEngageCommand from '../../../base/VivaEngageCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.coerce.number().optional().alias('i'),
+    email: z.string().optional()
+});
 class VivaEngageUserGetCommand extends VivaEngageCommand {
     get name() {
         return commands.ENGAGE_USER_GET;
@@ -15,12 +16,14 @@ class VivaEngageUserGetCommand extends VivaEngageCommand {
     get description() {
         return 'Retrieves the current user or searches for a user by ID or e-mail';
     }
-    constructor() {
-        super();
-        _VivaEngageUserGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _VivaEngageUserGetCommand_instances, "m", _VivaEngageUserGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _VivaEngageUserGetCommand_instances, "m", _VivaEngageUserGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _VivaEngageUserGetCommand_instances, "m", _VivaEngageUserGetCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => !(opts.id !== undefined && opts.email !== undefined), {
+            message: 'You are only allowed to search by ID or e-mail but not both'
+        });
     }
     async commandAction(logger, args) {
         let endPoint = `${this.resource}/v1/users/current.json`;
@@ -47,26 +50,5 @@ class VivaEngageUserGetCommand extends VivaEngageCommand {
         }
     }
 }
-_VivaEngageUserGetCommand_instances = new WeakSet(), _VivaEngageUserGetCommand_initTelemetry = function _VivaEngageUserGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userId: args.options.id !== undefined,
-            email: args.options.email !== undefined
-        });
-    });
-}, _VivaEngageUserGetCommand_initOptions = function _VivaEngageUserGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '--email [email]'
-    });
-}, _VivaEngageUserGetCommand_initValidators = function _VivaEngageUserGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id !== undefined && args.options.email !== undefined) {
-            return `You are only allowed to search by ID or e-mail but not both`;
-        }
-        return true;
-    });
-};
 export default new VivaEngageUserGetCommand();
 //# sourceMappingURL=engage-user-get.js.map

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

@@ -1,12 +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 _VivaEngageUserListCommand_instances, _VivaEngageUserListCommand_initTelemetry, _VivaEngageUserListCommand_initOptions, _VivaEngageUserListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import VivaEngageCommand from '../../../base/VivaEngageCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    groupId: z.coerce.number().optional().alias('g'),
+    letter: z.string().optional().alias('l'),
+    reverse: z.boolean().optional(),
+    limit: z.coerce.number().optional(),
+    sortBy: z.enum(['messages', 'followers']).optional()
+});
 class VivaEngageUserListCommand extends VivaEngageCommand {
     get name() {
         return commands.ENGAGE_USER_LIST;
@@ -17,13 +21,17 @@ class VivaEngageUserListCommand extends VivaEngageCommand {
     defaultProperties() {
         return ['id', 'full_name', 'email'];
     }
-    constructor() {
-        super();
-        _VivaEngageUserListCommand_instances.add(this);
-        this.items = [];
-        __classPrivateFieldGet(this, _VivaEngageUserListCommand_instances, "m", _VivaEngageUserListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _VivaEngageUserListCommand_instances, "m", _VivaEngageUserListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _VivaEngageUserListCommand_instances, "m", _VivaEngageUserListCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => !opts.letter || /^(?!\d)[a-zA-Z]+$/i.test(opts.letter), {
+            message: `Value of 'letter' is invalid. Only characters within the ranges [A - Z], [a - z] are allowed.`
+        })
+            .refine(opts => !opts.letter || opts.letter.length === 1, {
+            message: `Only one char as value of 'letter' accepted.`
+        });
     }
     getAllItems(logger, args, page) {
         return new Promise((resolve, reject) => {
@@ -35,7 +43,7 @@ class VivaEngageUserListCommand extends VivaEngageCommand {
                 endPoint = `${this.resource}/v1/users/in_group/${args.options.groupId}.json`;
             }
             endPoint += `?page=${page}`;
-            if (args.options.reverse !== undefined) {
+            if (args.options.reverse) {
                 endPoint += `&reverse=true`;
             }
             if (args.options.sortBy !== undefined) {
@@ -98,48 +106,5 @@ class VivaEngageUserListCommand extends VivaEngageCommand {
         }
     }
 }
-_VivaEngageUserListCommand_instances = new WeakSet(), _VivaEngageUserListCommand_initTelemetry = function _VivaEngageUserListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            letter: args.options.letter !== undefined,
-            sortBy: args.options.sortBy !== undefined,
-            reverse: args.options.reverse !== undefined,
-            limit: args.options.limit !== undefined,
-            groupId: args.options.groupId !== undefined
-        });
-    });
-}, _VivaEngageUserListCommand_initOptions = function _VivaEngageUserListCommand_initOptions() {
-    this.options.unshift({
-        option: '-g, --groupId [groupId]'
-    }, {
-        option: '-l, --letter [letter]'
-    }, {
-        option: '--reverse'
-    }, {
-        option: '--limit [limit]'
-    }, {
-        option: '--sortBy [sortBy]',
-        autocomplete: ['messages', 'followers']
-    });
-}, _VivaEngageUserListCommand_initValidators = function _VivaEngageUserListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.groupId && typeof args.options.groupId !== 'number') {
-            return `${args.options.groupId} is not a number`;
-        }
-        if (args.options.limit && typeof args.options.limit !== 'number') {
-            return `${args.options.limit} is not a number`;
-        }
-        if (args.options.sortBy && args.options.sortBy !== 'messages' && args.options.sortBy !== 'followers') {
-            return `sortBy accepts only the values "messages" or "followers"`;
-        }
-        if (args.options.letter && !/^(?!\d)[a-zA-Z]+$/i.test(args.options.letter)) {
-            return `Value of 'letter' is invalid. Only characters within the ranges [A - Z], [a - z] are allowed.`;
-        }
-        if (args.options.letter && args.options.letter.length !== 1) {
-            return `Only one char as value of 'letter' accepted.`;
-        }
-        return true;
-    });
-};
 export default new VivaEngageUserListCommand();
 //# sourceMappingURL=engage-user-list.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "12.1.0-beta.ab87e08",
+  "version": "12.1.0-beta.f55735f",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",