@pnp/cli-microsoft365 12.0.0-beta.8dff3ac → 12.0.0-beta.93e11fb

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-add.js

@@ -111,6 +111,13 @@ class SpoTenantApplicationCustomizerAddCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr('Pre-checks finished. Adding tenant wide extension to the TenantWideExtensions list');
         }
+        const output = options.output === 'text' ||
+            options.output === 'csv' ||
+            options.output === 'json' ||
+            options.output === 'md' ||
+            options.output === 'none'
+            ? options.output
+            : undefined;
         const commandOptions = {
             webUrl: appCatalogUrl,
             listUrl: `${urlUtil.getServerRelativeSiteUrl(appCatalogUrl)}/Lists/TenantWideExtensions`,
@@ -125,7 +132,7 @@ class SpoTenantApplicationCustomizerAddCommand extends SpoCommand {
             TenantWideExtensionDisabled: false,
             verbose: this.verbose,
             debug: this.debug,
-            output: options.output
+            output: output
         };
         await cli.executeCommand(spoListItemAddCommand, { options: { ...commandOptions, _: [] } });
     }

package/dist/m365/spo/commands/tenant/tenant-commandset-add.js

@@ -111,6 +111,13 @@ class SpoTenantCommandSetAddCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr('Pre-checks finished. Adding tenant wide extension to the TenantWideExtensions list');
         }
+        const output = options.output === 'text' ||
+            options.output === 'csv' ||
+            options.output === 'json' ||
+            options.output === 'md' ||
+            options.output === 'none'
+            ? options.output
+            : undefined;
         const commandOptions = {
             webUrl: appCatalogUrl,
             listUrl: `${urlUtil.getServerRelativeSiteUrl(appCatalogUrl)}/Lists/TenantWideExtensions`,
@@ -124,7 +131,7 @@ class SpoTenantCommandSetAddCommand extends SpoCommand {
             TenantWideExtensionDisabled: false,
             verbose: this.verbose,
             debug: this.debug,
-            output: options.output
+            output: output
         };
         await cli.executeCommand(spoListItemAddCommand, { options: { ...commandOptions, _: [] } });
     }

package/dist/m365/spo/commands/term/term-group-list.js

@@ -6,6 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoTermGroupListCommand_instances, _SpoTermGroupListCommand_initTelemetry, _SpoTermGroupListCommand_initOptions, _SpoTermGroupListCommand_initValidators;
 import config from '../../../../config.js';
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -48,14 +49,12 @@ class SpoTermGroupListCommand extends SpoCommand {
                 throw response.ErrorInfo.ErrorMessage;
             }
             const result = json[json.length - 1];
-            if (result._Child_Items_ && result._Child_Items_.length > 0) {
-                result._Child_Items_.forEach(t => {
-                    t.CreatedDate = new Date(Number(t.CreatedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
-                    t.Id = t.Id.replace('/Guid(', '').replace(')/', '');
-                    t.LastModifiedDate = new Date(Number(t.LastModifiedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
-                });
-                await logger.log(result._Child_Items_);
-            }
+            result._Child_Items_.forEach(t => {
+                t.CreatedDate = new Date(Number(t.CreatedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
+                t.Id = formatting.extractCsomGuid(t.Id);
+                t.LastModifiedDate = new Date(Number(t.LastModifiedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
+            });
+            await logger.log(result._Child_Items_);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/spo/commands/term/term-set-list.js

@@ -51,15 +51,12 @@ class SpoTermSetListCommand extends SpoCommand {
                 throw response.ErrorInfo.ErrorMessage;
             }
             const result = json[json.length - 1];
-            if (result._Child_Items_ && result._Child_Items_.length > 0) {
-                result._Child_Items_.map(t => {
-                    t.CreatedDate = new Date(Number(t.CreatedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
-                    t.Id = t.Id.replace('/Guid(', '').replace(')/', '');
-                    t.LastModifiedDate = new Date(Number(t.LastModifiedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
-                    return t;
-                });
-                await logger.log(result._Child_Items_);
-            }
+            result._Child_Items_.forEach(t => {
+                t.CreatedDate = new Date(Number(t.CreatedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
+                t.Id = formatting.extractCsomGuid(t.Id);
+                t.LastModifiedDate = new Date(Number(t.LastModifiedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
+            });
+            await logger.log(result._Child_Items_);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/spo/commands/web/web-rule-get.js

@@ -0,0 +1,47 @@
+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 SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string().alias('u')
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint URL.`
+    }),
+    id: z.uuid()
+});
+class SpoWebRuleGetCommand extends SpoCommand {
+    get name() {
+        return commands.WEB_RULE_GET;
+    }
+    get description() {
+        return 'Retrieves details of a specific rule from a SharePoint site list';
+    }
+    get schema() {
+        return options;
+    }
+    async commandAction(logger, args) {
+        try {
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving rule with id '${args.options.id}' from site '${args.options.webUrl}'...`);
+            }
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/alerts/GetById('${formatting.encodeQueryParameter(args.options.id)}')?$expand=List,User,List/Rootfolder&$select=*,List/Id,List/Title,List/Rootfolder/ServerRelativeUrl`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const res = await request.get(requestOptions);
+            await logger.log(res);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new SpoWebRuleGetCommand();
+//# sourceMappingURL=web-rule-get.js.map

package/dist/m365/spo/commands.js

@@ -72,6 +72,7 @@ export default {
     FILE_MOVE: `${prefix} file move`,
     FILE_REMOVE: `${prefix} file remove`,
     FILE_RENAME: `${prefix} file rename`,
+    FILE_UNARCHIVE: `${prefix} file unarchive`,
     FILE_RETENTIONLABEL_ENSURE: `${prefix} file retentionlabel ensure`,
     FILE_RETENTIONLABEL_REMOVE: `${prefix} file retentionlabel remove`,
     FILE_ROLEASSIGNMENT_ADD: `${prefix} file roleassignment add`,
@@ -85,7 +86,6 @@ export default {
     FILE_SHARINGLINK_LIST: `${prefix} file sharinglink list`,
     FILE_SHARINGLINK_REMOVE: `${prefix} file sharinglink remove`,
     FILE_SHARINGLINK_SET: `${prefix} file sharinglink set`,
-    FILE_UNARCHIVE: `${prefix} file unarchive`,
     FILE_VERSION_CLEAR: `${prefix} file version clear`,
     FILE_VERSION_GET: `${prefix} file version get`,
     FILE_VERSION_KEEP: `${prefix} file version keep`,
@@ -112,6 +112,7 @@ export default {
     FOLDER_SHARINGLINK_LIST: `${prefix} folder sharinglink list`,
     FOLDER_SHARINGLINK_REMOVE: `${prefix} folder sharinglink remove`,
     FOLDER_SHARINGLINK_SET: `${prefix} folder sharinglink set`,
+    FOLDER_UNARCHIVE: `${prefix} folder unarchive`,
     GET: `${prefix} get`,
     GROUP_ADD: `${prefix} group add`,
     GROUP_GET: `${prefix} group get`,
@@ -235,6 +236,7 @@ export default {
     PAGE_TEMPLATE_LIST: `${prefix} page template list`,
     PAGE_TEMPLATE_REMOVE: `${prefix} page template remove`,
     PAGE_TEXT_ADD: `${prefix} page text add`,
+    PAGE_UNPUBLISH: `${prefix} page unpublish`,
     PROPERTYBAG_GET: `${prefix} propertybag get`,
     PROPERTYBAG_LIST: `${prefix} propertybag list`,
     PROPERTYBAG_REMOVE: `${prefix} propertybag remove`,
@@ -377,6 +379,7 @@ export default {
     WEB_ROLEASSIGNMENT_ADD: `${prefix} web roleassignment add`,
     WEB_ROLEINHERITANCE_BREAK: `${prefix} web roleinheritance break`,
     WEB_ROLEINHERITANCE_RESET: `${prefix} web roleinheritance reset`,
+    WEB_RULE_GET: `${prefix} web rule get`,
     WEB_RULE_LIST: `${prefix} web rule list`,
     WEB_RULE_REMOVE: `${prefix} web rule remove`,
     WEB_SET: `${prefix} web set`

package/dist/m365/spp/commands/contentcenter/contentcenter-list.js

@@ -1,8 +1,10 @@
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = globalOptionsZod.strict();
 class SppContentCenterListCommand extends SpoCommand {
     get name() {
         return commands.CONTENTCENTER_LIST;
@@ -13,6 +15,9 @@ class SppContentCenterListCommand extends SpoCommand {
     defaultProperties() {
         return ['Title', 'Url'];
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         try {
             if (this.verbose) {

package/dist/m365/spp/commands/model/model-get.js

@@ -1,15 +1,22 @@
-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 _SppModelGetCommand_instances, _SppModelGetCommand_initTelemetry, _SppModelGetCommand_initOptions, _SppModelGetCommand_initValidators, _SppModelGetCommand_initOptionSets, _SppModelGetCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import { spp } from '../../../../utils/spp.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    siteUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u'),
+    id: z.guid().optional().alias('i'),
+    title: z.string().optional().alias('t'),
+    withPublications: z.boolean().optional()
+});
 class SppModelGetCommand extends SpoCommand {
     get name() {
         return commands.MODEL_GET;
@@ -17,14 +24,18 @@ class SppModelGetCommand extends SpoCommand {
     get description() {
         return 'Retrieves information about a document understanding model';
     }
-    constructor() {
-        super();
-        _SppModelGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SppModelGetCommand_instances, "m", _SppModelGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SppModelGetCommand_instances, "m", _SppModelGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SppModelGetCommand_instances, "m", _SppModelGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SppModelGetCommand_instances, "m", _SppModelGetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SppModelGetCommand_instances, "m", _SppModelGetCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.title].filter(x => x !== undefined).length === 1, {
+            message: `Specify either 'id' or 'title', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'title']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -56,36 +67,5 @@ class SppModelGetCommand extends SpoCommand {
         }
     }
 }
-_SppModelGetCommand_instances = new WeakSet(), _SppModelGetCommand_initTelemetry = function _SppModelGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            title: typeof args.options.title !== 'undefined',
-            withPublications: !!args.options.withPublications
-        });
-    });
-}, _SppModelGetCommand_initOptions = function _SppModelGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --siteUrl <siteUrl>'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '--withPublications'
-    });
-}, _SppModelGetCommand_initValidators = function _SppModelGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID for option 'id'.`;
-        }
-        return validation.isValidSharePointUrl(args.options.siteUrl);
-    });
-}, _SppModelGetCommand_initOptionSets = function _SppModelGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title'] });
-}, _SppModelGetCommand_initTypes = function _SppModelGetCommand_initTypes() {
-    this.types.string.push('siteUrl', 'id', 'title');
-    this.types.boolean.push('withPublications');
-};
 export default new SppModelGetCommand();
 //# sourceMappingURL=model-get.js.map

package/dist/m365/spp/commands/model/model-list.js

@@ -1,15 +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 _SppModelListCommand_instances, _SppModelListCommand_initOptions, _SppModelListCommand_initTypes, _SppModelListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import { spp } from '../../../../utils/spp.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    siteUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u')
+});
 class SppModelListCommand extends SpoCommand {
     get name() {
         return commands.MODEL_LIST;
@@ -20,12 +24,8 @@ class SppModelListCommand extends SpoCommand {
     defaultProperties() {
         return ['AIBuilderHybridModelType', 'ContentTypeName', 'LastTrained', 'UniqueId'];
     }
-    constructor() {
-        super();
-        _SppModelListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SppModelListCommand_instances, "m", _SppModelListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SppModelListCommand_instances, "m", _SppModelListCommand_initTypes).call(this);
-        __classPrivateFieldGet(this, _SppModelListCommand_instances, "m", _SppModelListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -42,16 +42,5 @@ class SppModelListCommand extends SpoCommand {
         }
     }
 }
-_SppModelListCommand_instances = new WeakSet(), _SppModelListCommand_initOptions = function _SppModelListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --siteUrl <siteUrl>'
-    });
-}, _SppModelListCommand_initTypes = function _SppModelListCommand_initTypes() {
-    this.types.string.push('siteUrl');
-}, _SppModelListCommand_initValidators = function _SppModelListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        return validation.isValidSharePointUrl(args.options.siteUrl);
-    });
-};
 export default new SppModelListCommand();
 //# sourceMappingURL=model-list.js.map

package/dist/m365/spp/commands/model/model-remove.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 _SppModelRemoveCommand_instances, _SppModelRemoveCommand_initTelemetry, _SppModelRemoveCommand_initOptions, _SppModelRemoveCommand_initValidators, _SppModelRemoveCommand_initOptionSets, _SppModelRemoveCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -12,6 +8,17 @@ import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    siteUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u'),
+    id: z.guid().optional().alias('i'),
+    title: z.string().optional().alias('t'),
+    force: z.boolean().optional().alias('f')
+});
 class SppModelRemoveCommand extends SpoCommand {
     get name() {
         return commands.MODEL_REMOVE;
@@ -19,14 +26,18 @@ class SppModelRemoveCommand extends SpoCommand {
     get description() {
         return 'Deletes a document understanding model';
     }
-    constructor() {
-        super();
-        _SppModelRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SppModelRemoveCommand_instances, "m", _SppModelRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SppModelRemoveCommand_instances, "m", _SppModelRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SppModelRemoveCommand_instances, "m", _SppModelRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SppModelRemoveCommand_instances, "m", _SppModelRemoveCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SppModelRemoveCommand_instances, "m", _SppModelRemoveCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.title].filter(x => x !== undefined).length === 1, {
+            message: `Specify either 'id' or 'title', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'title']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -70,36 +81,5 @@ class SppModelRemoveCommand extends SpoCommand {
         }
     }
 }
-_SppModelRemoveCommand_instances = new WeakSet(), _SppModelRemoveCommand_initTelemetry = function _SppModelRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            title: typeof args.options.title !== 'undefined',
-            force: !!args.options.force
-        });
-    });
-}, _SppModelRemoveCommand_initOptions = function _SppModelRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --siteUrl <siteUrl>'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '-f, --force'
-    });
-}, _SppModelRemoveCommand_initValidators = function _SppModelRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID for option 'id'.`;
-        }
-        return validation.isValidSharePointUrl(args.options.siteUrl);
-    });
-}, _SppModelRemoveCommand_initOptionSets = function _SppModelRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title'] });
-}, _SppModelRemoveCommand_initTypes = function _SppModelRemoveCommand_initTypes() {
-    this.types.string.push('siteUrl', 'id', 'title');
-    this.types.boolean.push('force');
-};
 export default new SppModelRemoveCommand();
 //# sourceMappingURL=model-remove.js.map

package/dist/m365/teams/commands/channel/channel-add.js

@@ -1,14 +1,30 @@
-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 _TeamsChannelAddCommand_instances, _TeamsChannelAddCommand_initTelemetry, _TeamsChannelAddCommand_initOptions, _TeamsChannelAddCommand_initValidators, _TeamsChannelAddCommand_initOptionSets;
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from "../../../base/GraphCommand.js";
 import commands from '../../commands.js';
 import { teams } from '../../../../utils/teams.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    teamId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    })
+        .optional()
+        .alias('i'),
+    teamName: z.string()
+        .optional(),
+    name: z.string()
+        .alias('n'),
+    description: z.string()
+        .optional()
+        .alias('d'),
+    type: z.enum(['standard', 'private', 'shared'])
+        .optional(),
+    owner: z.string()
+        .optional()
+});
 class TeamsChannelAddCommand extends GraphCommand {
     get name() {
         return commands.CHANNEL_ADD;
@@ -16,13 +32,30 @@ class TeamsChannelAddCommand extends GraphCommand {
     get description() {
         return 'Adds a channel to the specified Microsoft Teams team';
     }
-    constructor() {
-        super();
-        _TeamsChannelAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TeamsChannelAddCommand_instances, "m", _TeamsChannelAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsChannelAddCommand_instances, "m", _TeamsChannelAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsChannelAddCommand_instances, "m", _TeamsChannelAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _TeamsChannelAddCommand_instances, "m", _TeamsChannelAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.teamId, opts.teamName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either teamId or teamName, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['teamId', 'teamName']
+            }
+        })
+            .refine(opts => !((opts.type === 'private' || opts.type === 'shared') && !opts.owner), {
+            message: 'Specify owner when creating a private or shared channel.',
+            params: {
+                customCode: 'required'
+            }
+        })
+            .refine(opts => !((opts.type !== 'private' && opts.type !== 'shared') && opts.owner), {
+            message: 'Specify owner only when creating a private or shared channel.',
+            params: {
+                customCode: 'required'
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -66,49 +99,5 @@ class TeamsChannelAddCommand extends GraphCommand {
         return request.post(requestOptions);
     }
 }
-_TeamsChannelAddCommand_instances = new WeakSet(), _TeamsChannelAddCommand_initTelemetry = function _TeamsChannelAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            description: typeof args.options.description !== 'undefined',
-            teamId: typeof args.options.teamId !== 'undefined',
-            teamName: typeof args.options.teamName !== 'undefined',
-            type: args.options.type || 'standard',
-            owner: typeof args.options.owner !== 'undefined'
-        });
-    });
-}, _TeamsChannelAddCommand_initOptions = function _TeamsChannelAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --teamId [teamId]'
-    }, {
-        option: '--teamName [teamName]'
-    }, {
-        option: '-n, --name <name>'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '--type [type]',
-        autocomplete: ['standard', 'private', 'shared']
-    }, {
-        option: '--owner [owner]'
-    });
-}, _TeamsChannelAddCommand_initValidators = function _TeamsChannelAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
-        }
-        if (args.options.type && ['standard', 'private', 'shared'].indexOf(args.options.type) === -1) {
-            return `${args.options.type} is not a valid type value. Allowed values standard|private|shared.`;
-        }
-        if ((args.options.type === 'private' || args.options.type === 'shared') && !args.options.owner) {
-            return `Specify owner when creating a ${args.options.type} channel.`;
-        }
-        if ((args.options.type !== 'private' && args.options.type !== 'shared') && args.options.owner) {
-            return `Specify owner only when creating a private or shared channel.`;
-        }
-        return true;
-    });
-}, _TeamsChannelAddCommand_initOptionSets = function _TeamsChannelAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['teamId', 'teamName'] });
-};
 export default new TeamsChannelAddCommand();
 //# sourceMappingURL=channel-add.js.map