@pnp/cli-microsoft365 11.9.0-beta.f8dc984 → 11.10.0-beta.6474466

package/dist/m365/graph/commands/subscription/subscription-add.js

@@ -1,13 +1,24 @@
-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 _GraphSubscriptionAddCommand_instances, _GraphSubscriptionAddCommand_initTelemetry, _GraphSubscriptionAddCommand_initOptions, _GraphSubscriptionAddCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+const allowedTlsVersions = ['v1_0', 'v1_1', 'v1_2', 'v1_3'];
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    resource: z.string().alias('r'),
+    notificationUrl: z.string().alias('u'),
+    changeTypes: z.string().alias('c'),
+    expirationDateTime: z.string().optional().alias('e'),
+    clientState: z.string().optional().alias('s'),
+    lifecycleNotificationUrl: z.string().optional(),
+    notificationUrlAppId: z.string().optional(),
+    latestTLSVersion: z.enum(allowedTlsVersions).optional(),
+    withResourceData: z.boolean().optional(),
+    encryptionCertificate: z.string().optional(),
+    encryptionCertificateId: z.string().optional()
+});
 const DEFAULT_EXPIRATION_DELAY_IN_MINUTES_PER_RESOURCE_TYPE = {
     // User, group, other directory resources	4230 minutes (under 3 days)
     "users": 4230,
@@ -34,13 +45,52 @@ class GraphSubscriptionAddCommand extends GraphCommand {
     get description() {
         return 'Creates a Microsoft Graph subscription';
     }
-    constructor() {
-        super();
-        _GraphSubscriptionAddCommand_instances.add(this);
-        this.allowedTlsVersions = ['v1_0', 'v1_1', 'v1_2', 'v1_3'];
-        __classPrivateFieldGet(this, _GraphSubscriptionAddCommand_instances, "m", _GraphSubscriptionAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _GraphSubscriptionAddCommand_instances, "m", _GraphSubscriptionAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _GraphSubscriptionAddCommand_instances, "m", _GraphSubscriptionAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => {
+            const url = options.notificationUrl.toLowerCase();
+            return url.startsWith('https://') || url.startsWith('eventhub:https://') || url.startsWith('eventgrid:?azuresubscriptionid=');
+        }, {
+            error: e => `The specified notification URL '${e.input.notificationUrl}' does not start with either 'https://' or 'EventHub:https://' or 'EventGrid:?azuresubscriptionid='`,
+            path: ['notificationUrl']
+        })
+            .refine(options => this.isValidChangeTypes(options.changeTypes), {
+            error: `The specified changeTypes are invalid. Valid options are 'created', 'updated' and 'deleted'`,
+            path: ['changeTypes']
+        })
+            .refine(options => !options.expirationDateTime || validation.isValidISODateTime(options.expirationDateTime), {
+            error: 'The expirationDateTime is not a valid ISO date string',
+            path: ['expirationDateTime']
+        })
+            .refine(options => !options.clientState || options.clientState.length <= 128, {
+            error: 'The clientState value exceeds the maximum length of 128 characters',
+            path: ['clientState']
+        })
+            .refine(options => {
+            if (!options.lifecycleNotificationUrl) {
+                return true;
+            }
+            const url = options.lifecycleNotificationUrl.toLowerCase();
+            return url.startsWith('https://') || url.startsWith('eventhub:https://') || url.startsWith('eventgrid:?azuresubscriptionid=');
+        }, {
+            error: e => `The lifecycle notification URL '${e.input.lifecycleNotificationUrl}' does not start with either 'https://' or 'EventHub:https://' or 'EventGrid:?azuresubscriptionid='`,
+            path: ['lifecycleNotificationUrl']
+        })
+            .refine(options => !options.withResourceData || options.encryptionCertificate, {
+            error: `The 'encryptionCertificate' options is required to include the changed resource data`,
+            path: ['encryptionCertificate']
+        })
+            .refine(options => !options.withResourceData || options.encryptionCertificateId, {
+            error: `The 'encryptionCertificateId' options is required to include the changed resource data`,
+            path: ['encryptionCertificateId']
+        })
+            .refine(options => !options.notificationUrlAppId || validation.isValidGuid(options.notificationUrlAppId), {
+            error: e => `${e.input.notificationUrlAppId} is not a valid GUID for the 'notificationUrlAppId'`,
+            path: ['notificationUrlAppId']
+        });
     }
     async commandAction(logger, args) {
         const data = {
@@ -123,81 +173,5 @@ class GraphSubscriptionAddCommand extends GraphCommand {
         return invalidChangesTypes.length === 0;
     }
 }
-_GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCommand_initTelemetry = function _GraphSubscriptionAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            changeTypes: args.options.changeTypes,
-            expirationDateTime: typeof args.options.expirationDateTime !== 'undefined',
-            clientState: typeof args.options.clientState !== 'undefined',
-            lifecycleNotificationUrl: typeof args.options.lifecycleNotificationUrl !== 'undefined',
-            notificationUrlAppId: typeof args.options.notificationUrlAppId !== 'undefined',
-            latestTLSVersion: typeof args.options.latestTLSVersion !== 'undefined',
-            withResourceData: !!args.options.withResourceData,
-            encryptionCertificate: typeof args.options.encryptionCertificate !== 'undefined',
-            encryptionCertificateId: typeof args.options.encryptionCertificateId !== 'undefined'
-        });
-    });
-}, _GraphSubscriptionAddCommand_initOptions = function _GraphSubscriptionAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-r, --resource <resource>'
-    }, {
-        option: '-u, --notificationUrl <notificationUrl>'
-    }, {
-        option: '-c, --changeTypes <changeTypes>',
-        autocomplete: ['created', 'updated', 'deleted']
-    }, {
-        option: '-e, --expirationDateTime [expirationDateTime]'
-    }, {
-        option: '-s, --clientState [clientState]'
-    }, {
-        option: '--lifecycleNotificationUrl [lifecycleNotificationUrl]'
-    }, {
-        option: '--notificationUrlAppId [notificationUrlAppId]'
-    }, {
-        option: '--latestTLSVersion [latestTLSVersion]',
-        autocomplete: this.allowedTlsVersions
-    }, {
-        option: '--withResourceData [withResourceData]'
-    }, {
-        option: '--encryptionCertificate [encryptionCertificate]'
-    }, {
-        option: '--encryptionCertificateId [encryptionCertificateId]'
-    });
-}, _GraphSubscriptionAddCommand_initValidators = function _GraphSubscriptionAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!args.options.notificationUrl.toLowerCase().startsWith('https://')
-            && !args.options.notificationUrl.toLowerCase().startsWith('eventhub:https://')
-            && !args.options.notificationUrl.toLowerCase().startsWith('eventgrid:?azuresubscriptionid=')) {
-            return `The specified notification URL '${args.options.notificationUrl}' does not start with either 'https://' or 'EventHub:https://' or 'EventGrid:?azuresubscriptionid='`;
-        }
-        if (!this.isValidChangeTypes(args.options.changeTypes)) {
-            return `The specified changeTypes are invalid. Valid options are 'created', 'updated' and 'deleted'`;
-        }
-        if (args.options.expirationDateTime && !validation.isValidISODateTime(args.options.expirationDateTime)) {
-            return 'The expirationDateTime is not a valid ISO date string';
-        }
-        if (args.options.clientState && args.options.clientState.length > 128) {
-            return 'The clientState value exceeds the maximum length of 128 characters';
-        }
-        if (args.options.lifecycleNotificationUrl && !args.options.lifecycleNotificationUrl.toLowerCase().startsWith('https://')
-            && !args.options.lifecycleNotificationUrl.toLowerCase().startsWith('eventhub:https://')
-            && !args.options.lifecycleNotificationUrl.toLowerCase().startsWith('eventgrid:?azuresubscriptionid=')) {
-            return `The lifecycle notification URL '${args.options.lifecycleNotificationUrl}' does not start with either 'https://' or 'EventHub:https://' or 'EventGrid:?azuresubscriptionid='`;
-        }
-        if (args.options.latestTLSVersion && this.allowedTlsVersions.map(x => x.toLowerCase()).indexOf(args.options.latestTLSVersion.toLowerCase()) === -1) {
-            return `${args.options.latestTLSVersion} is not a valid TLS version. Allowed values are ${this.allowedTlsVersions.join(', ')}`;
-        }
-        if (args.options.withResourceData && !args.options.encryptionCertificate) {
-            return `The 'encryptionCertificate' options is required to include the changed resource data`;
-        }
-        if (args.options.withResourceData && !args.options.encryptionCertificateId) {
-            return `The 'encryptionCertificateId' options is required to include the changed resource data`;
-        }
-        if (args.options.notificationUrlAppId && !validation.isValidGuid(args.options.notificationUrlAppId)) {
-            return `${args.options.notificationUrlAppId} is not a valid GUID for the 'notificationUrlAppId'`;
-        }
-        return true;
-    });
-};
 export default new GraphSubscriptionAddCommand();
 //# sourceMappingURL=subscription-add.js.map

package/dist/m365/onedrive/commands/report/report-activityfilecounts.js

@@ -1,5 +1,12 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import PeriodBasedReport from '../../../base/PeriodBasedReport.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    output: z.enum(['csv', 'json']).optional().alias('o'),
+    period: z.enum(['D7', 'D30', 'D90', 'D180']).alias('p')
+});
 class OneDriveReportActivityFileCountCommand extends PeriodBasedReport {
     get name() {
         return commands.REPORT_ACTIVITYFILECOUNTS;
@@ -10,6 +17,9 @@ class OneDriveReportActivityFileCountCommand extends PeriodBasedReport {
     get description() {
         return 'Gets the number of unique, licensed users that performed file interactions against any OneDrive account';
     }
+    get schema() {
+        return options;
+    }
 }
 export default new OneDriveReportActivityFileCountCommand();
 //# sourceMappingURL=report-activityfilecounts.js.map

package/dist/m365/onedrive/commands/report/report-activityusercounts.js

@@ -1,5 +1,12 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import PeriodBasedReport from '../../../base/PeriodBasedReport.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    output: z.enum(['csv', 'json']).optional().alias('o'),
+    period: z.enum(['D7', 'D30', 'D90', 'D180']).alias('p')
+});
 class OneDriveReportActivityUserCountCommand extends PeriodBasedReport {
     get name() {
         return commands.REPORT_ACTIVITYUSERCOUNTS;
@@ -10,6 +17,9 @@ class OneDriveReportActivityUserCountCommand extends PeriodBasedReport {
     get description() {
         return 'Gets the trend in the number of active OneDrive users';
     }
+    get schema() {
+        return options;
+    }
 }
 export default new OneDriveReportActivityUserCountCommand();
 //# sourceMappingURL=report-activityusercounts.js.map

package/dist/m365/onedrive/commands/report/report-activityuserdetail.js

@@ -1,5 +1,13 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import DateAndPeriodBasedReport from '../../../base/DateAndPeriodBasedReport.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    output: z.enum(['csv', 'json']).optional().alias('o'),
+    period: z.enum(['D7', 'D30', 'D90', 'D180']).optional().alias('p'),
+    date: z.string().regex(/^\d{4}-\d{2}-\d{2}$/, 'The supported date format is YYYY-MM-DD').optional().alias('d')
+});
 class OneDriveReportActivityUserDetailCommand extends DateAndPeriodBasedReport {
     get name() {
         return commands.REPORT_ACTIVITYUSERDETAIL;
@@ -10,6 +18,19 @@ class OneDriveReportActivityUserDetailCommand extends DateAndPeriodBasedReport {
     get description() {
         return 'Gets details about OneDrive activity by user';
     }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine((opts) => opts.period !== undefined || opts.date !== undefined, {
+            message: 'Specify period or date, one is required.',
+            params: { customCode: 'optionSet', options: ['period', 'date'] }
+        })
+            .refine((opts) => !(opts.period !== undefined && opts.date !== undefined), {
+            message: 'Specify period or date but not both.'
+        });
+    }
 }
 export default new OneDriveReportActivityUserDetailCommand();
 //# sourceMappingURL=report-activityuserdetail.js.map

package/dist/m365/onedrive/commands/report/report-usageaccountcounts.js

@@ -1,5 +1,12 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import PeriodBasedReport from '../../../base/PeriodBasedReport.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    output: z.enum(['csv', 'json']).optional().alias('o'),
+    period: z.enum(['D7', 'D30', 'D90', 'D180']).alias('p')
+});
 class OneDriveReportUsageAccountCountsCommand extends PeriodBasedReport {
     get name() {
         return commands.REPORT_USAGEACCOUNTCOUNTS;
@@ -10,6 +17,9 @@ class OneDriveReportUsageAccountCountsCommand extends PeriodBasedReport {
     get description() {
         return 'Gets the trend in the number of active OneDrive for Business sites';
     }
+    get schema() {
+        return options;
+    }
 }
 export default new OneDriveReportUsageAccountCountsCommand();
 //# sourceMappingURL=report-usageaccountcounts.js.map

package/dist/m365/onedrive/commands/report/report-usageaccountdetail.js

@@ -1,5 +1,13 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import DateAndPeriodBasedReport from '../../../base/DateAndPeriodBasedReport.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    output: z.enum(['csv', 'json']).optional().alias('o'),
+    period: z.enum(['D7', 'D30', 'D90', 'D180']).optional().alias('p'),
+    date: z.string().regex(/^\d{4}-\d{2}-\d{2}$/, 'The supported date format is YYYY-MM-DD').optional().alias('d')
+});
 class OneDriveReportUsageAccountDetailCommand extends DateAndPeriodBasedReport {
     get name() {
         return commands.REPORT_USAGEACCOUNTDETAIL;
@@ -10,6 +18,19 @@ class OneDriveReportUsageAccountDetailCommand extends DateAndPeriodBasedReport {
     get description() {
         return 'Gets details about OneDrive usage by account';
     }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine((opts) => opts.period !== undefined || opts.date !== undefined, {
+            message: 'Specify period or date, one is required.',
+            params: { customCode: 'optionSet', options: ['period', 'date'] }
+        })
+            .refine((opts) => !(opts.period !== undefined && opts.date !== undefined), {
+            message: 'Specify period or date but not both.'
+        });
+    }
 }
 export default new OneDriveReportUsageAccountDetailCommand();
 //# sourceMappingURL=report-usageaccountdetail.js.map

package/dist/m365/onedrive/commands/report/report-usagefilecounts.js

@@ -1,5 +1,12 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import PeriodBasedReport from '../../../base/PeriodBasedReport.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    output: z.enum(['csv', 'json']).optional().alias('o'),
+    period: z.enum(['D7', 'D30', 'D90', 'D180']).alias('p')
+});
 class OneDriveReportUsageFileCountsCommand extends PeriodBasedReport {
     get name() {
         return commands.REPORT_USAGEFILECOUNTS;
@@ -10,6 +17,9 @@ class OneDriveReportUsageFileCountsCommand extends PeriodBasedReport {
     get description() {
         return 'Gets the total number of files across all sites and how many are active files';
     }
+    get schema() {
+        return options;
+    }
 }
 export default new OneDriveReportUsageFileCountsCommand();
 //# sourceMappingURL=report-usagefilecounts.js.map

package/dist/m365/onedrive/commands/report/report-usagestorage.js

@@ -1,5 +1,12 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import PeriodBasedReport from '../../../base/PeriodBasedReport.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    output: z.enum(['csv', 'json']).optional().alias('o'),
+    period: z.enum(['D7', 'D30', 'D90', 'D180']).alias('p')
+});
 class OneDriveReportUsageStorageCommand extends PeriodBasedReport {
     get name() {
         return commands.REPORT_USAGESTORAGE;
@@ -10,6 +17,9 @@ class OneDriveReportUsageStorageCommand extends PeriodBasedReport {
     get description() {
         return 'Gets the trend on the amount of storage you are using in OneDrive for Business';
     }
+    get schema() {
+        return options;
+    }
 }
 export default new OneDriveReportUsageStorageCommand();
 //# sourceMappingURL=report-usagestorage.js.map

package/dist/m365/onenote/commands/notebook/notebook-add.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 _OneNoteNotebookAddCommand_instances, _OneNoteNotebookAddCommand_initTelemetry, _OneNoteNotebookAddCommand_initOptions, _OneNoteNotebookAddCommand_initValidators, _OneNoteNotebookAddCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { validation } from '../../../../utils/validation.js';
@@ -11,20 +7,50 @@ import commands from '../../commands.js';
 import { spo } from '../../../../utils/spo.js';
 import GraphDelegatedCommand from '../../../base/GraphDelegatedCommand.js';
 import { formatting } from '../../../../utils/formatting.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    name: z.string()
+        .refine(name => name.length <= 128, {
+        error: 'The specified name is too long. It should be at most 128 characters.'
+    })
+        .refine(name => !/[?*/:<>|'"]/.test(name), {
+        error: `The specified name contains invalid characters. It cannot contain ?*/:<>|'". Please remove them and try again.`
+    }).alias('n'),
+    userId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    }).optional(),
+    userName: z.string().optional(),
+    groupId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    }).optional(),
+    groupName: z.string().optional(),
+    webUrl: z.string().refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    }).optional().alias('u')
+});
 class OneNoteNotebookAddCommand extends GraphDelegatedCommand {
     get name() {
         return commands.NOTEBOOK_ADD;
     }
     get description() {
-        return 'Create a new OneNote notebook';
+        return 'Creates a new OneNote notebook';
     }
-    constructor() {
-        super();
-        _OneNoteNotebookAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _OneNoteNotebookAddCommand_instances, "m", _OneNoteNotebookAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _OneNoteNotebookAddCommand_instances, "m", _OneNoteNotebookAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _OneNoteNotebookAddCommand_instances, "m", _OneNoteNotebookAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _OneNoteNotebookAddCommand_instances, "m", _OneNoteNotebookAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => {
+            const opts = [options.userId, options.userName, options.groupId, options.groupName, options.webUrl];
+            const defined = opts.filter(item => item !== undefined);
+            return defined.length <= 1;
+        }, {
+            error: 'Specify userId, userName, groupId, groupName, or webUrl, but not multiple.',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName', 'groupId', 'groupName', 'webUrl']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -76,58 +102,5 @@ class OneNoteNotebookAddCommand extends GraphDelegatedCommand {
         return endpoint;
     }
 }
-_OneNoteNotebookAddCommand_instances = new WeakSet(), _OneNoteNotebookAddCommand_initTelemetry = function _OneNoteNotebookAddCommand_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',
-            webUrl: typeof args.options.webUrl !== 'undefined'
-        });
-    });
-}, _OneNoteNotebookAddCommand_initOptions = function _OneNoteNotebookAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name <name>'
-    }, {
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    }, {
-        option: '--groupId [groupId]'
-    }, {
-        option: '--groupName [groupName]'
-    }, {
-        option: '-u, --webUrl [webUrl]'
-    });
-}, _OneNoteNotebookAddCommand_initValidators = function _OneNoteNotebookAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        // check name for invalid characters
-        if (args.options.name.length > 128) {
-            return 'The specified name is too long. It should be less than 128 characters';
-        }
-        if (/[?*/:<>|'"]/.test(args.options.name)) {
-            return `The specified name contains invalid characters. It cannot contain ?*/:<>|'". Please remove them and try again.`;
-        }
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID`;
-        }
-        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID`;
-        }
-        if (args.options.webUrl) {
-            return validation.isValidSharePointUrl(args.options.webUrl);
-        }
-        return true;
-    });
-}, _OneNoteNotebookAddCommand_initOptionSets = function _OneNoteNotebookAddCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['userId', 'userName', 'groupId', 'groupName', 'webUrl'],
-        runsWhen: (args) => {
-            const options = [args.options.userId, args.options.userName, args.options.groupId, args.options.groupName, args.options.webUrl];
-            return options.some(item => item !== undefined);
-        }
-    });
-};
 export default new OneNoteNotebookAddCommand();
 //# sourceMappingURL=notebook-add.js.map

package/dist/m365/onenote/commands/notebook/notebook-list.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 _OneNoteNotebookListCommand_instances, _OneNoteNotebookListCommand_initTelemetry, _OneNoteNotebookListCommand_initOptions, _OneNoteNotebookListCommand_initValidators, _OneNoteNotebookListCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
@@ -11,24 +7,47 @@ import commands from '../../commands.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphDelegatedCommand from '../../../base/GraphDelegatedCommand.js';
 import { spo } from '../../../../utils/spo.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    userId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    }).optional(),
+    userName: z.string().optional(),
+    groupId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    }).optional(),
+    groupName: z.string().optional(),
+    webUrl: z.string().refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    }).optional().alias('u')
+});
 class OneNoteNotebookListCommand extends GraphDelegatedCommand {
     get name() {
         return commands.NOTEBOOK_LIST;
     }
     get description() {
-        return 'Retrieve a list of notebooks';
+        return 'Retrieves a list of notebooks';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => {
+            const opts = [options.userId, options.userName, options.groupId, options.groupName, options.webUrl];
+            const defined = opts.filter(item => item !== undefined);
+            return defined.length <= 1;
+        }, {
+            error: 'Specify userId, userName, groupId, groupName, or webUrl, but not multiple.',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName', 'groupId', 'groupName', 'webUrl']
+            }
+        });
     }
     defaultProperties() {
         return ['createdDateTime', 'displayName', 'id'];
     }
-    constructor() {
-        super();
-        _OneNoteNotebookListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initOptionSets).call(this);
-    }
     async getEndpointUrl(args) {
         let endpoint = `${this.resource}/v1.0/`;
         if (args.options.userId) {
@@ -41,8 +60,8 @@ class OneNoteNotebookListCommand extends GraphDelegatedCommand {
             endpoint += `groups/${args.options.groupId}`;
         }
         else if (args.options.groupName) {
-            const groupId = await this.getGroupId(args.options.groupName);
-            endpoint += `groups/${groupId}`;
+            const group = await entraGroup.getGroupByDisplayName(args.options.groupName);
+            endpoint += `groups/${group.id}`;
         }
         else if (args.options.webUrl) {
             const siteId = await spo.getSpoGraphSiteId(args.options.webUrl);
@@ -54,10 +73,6 @@ class OneNoteNotebookListCommand extends GraphDelegatedCommand {
         endpoint += '/onenote/notebooks';
         return endpoint;
     }
-    async getGroupId(groupName) {
-        const group = await entraGroup.getGroupByDisplayName(groupName);
-        return group.id;
-    }
     async commandAction(logger, args) {
         try {
             const endpoint = await this.getEndpointUrl(args);
@@ -69,39 +84,5 @@ class OneNoteNotebookListCommand extends GraphDelegatedCommand {
         }
     }
 }
-_OneNoteNotebookListCommand_instances = new WeakSet(), _OneNoteNotebookListCommand_initTelemetry = function _OneNoteNotebookListCommand_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',
-            webUrl: typeof args.options.webUrl !== 'undefined'
-        });
-    });
-}, _OneNoteNotebookListCommand_initOptions = function _OneNoteNotebookListCommand_initOptions() {
-    this.options.unshift({ option: '--userId [userId]' }, { option: '--userName [userName]' }, { option: '--groupId [groupId]' }, { option: '--groupName [groupName]' }, { option: '-u, --webUrl [webUrl]' });
-}, _OneNoteNotebookListCommand_initValidators = function _OneNoteNotebookListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID`;
-        }
-        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID`;
-        }
-        if (args.options.webUrl) {
-            return validation.isValidSharePointUrl(args.options.webUrl);
-        }
-        return true;
-    });
-}, _OneNoteNotebookListCommand_initOptionSets = function _OneNoteNotebookListCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['userId', 'userName', 'groupId', 'groupName', 'webUrl'],
-        runsWhen: (args) => {
-            const options = [args.options.userId, args.options.userName, args.options.groupId, args.options.groupName, args.options.webUrl];
-            return options.some(item => item !== undefined);
-        }
-    });
-};
 export default new OneNoteNotebookListCommand();
 //# sourceMappingURL=notebook-list.js.map