@pnp/cli-microsoft365 12.0.0-beta.10c5833 → 12.0.0-beta.235caf5

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`,

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/app/app-install.js

@@ -1,9 +1,3 @@
-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 _TeamsAppInstallCommand_instances, _TeamsAppInstallCommand_initTelemetry, _TeamsAppInstallCommand_initOptions, _TeamsAppInstallCommand_initValidators, _TeamsAppInstallCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { entraUser } from '../../../../utils/entraUser.js';
@@ -11,6 +5,22 @@ import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    }).optional().alias('i'),
+    name: z.string().optional().alias('n'),
+    teamId: z.string().refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    }).optional(),
+    userId: z.string().refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    }).optional(),
+    userName: z.string().optional()
+});
 class TeamsAppInstallCommand extends GraphCommand {
     get name() {
         return commands.APP_INSTALL;
@@ -18,13 +28,25 @@ class TeamsAppInstallCommand extends GraphCommand {
     get description() {
         return 'Installs a Microsoft Teams team app from the catalog in the specified team or for the specified user';
     }
-    constructor() {
-        super();
-        _TeamsAppInstallCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.teamId, opts.userId, opts.userName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either teamId, userId or userName, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['teamId', 'userId', 'userName']
+            }
+        })
+            .refine(opts => [opts.id, opts.name].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either id or name, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -101,36 +123,5 @@ class TeamsAppInstallCommand extends GraphCommand {
         return app.id;
     }
 }
-_TeamsAppInstallCommand_instances = new WeakSet(), _TeamsAppInstallCommand_initTelemetry = function _TeamsAppInstallCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined',
-            teamId: typeof args.options.teamId !== 'undefined',
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined'
-        });
-    });
-}, _TeamsAppInstallCommand_initOptions = function _TeamsAppInstallCommand_initOptions() {
-    this.options.unshift({ option: '-i, --id [id]' }, { option: '-n, --name [name]' }, { option: '--teamId [teamId]' }, { option: '--userId [userId]' }, { option: '--userName [userName]' });
-}, _TeamsAppInstallCommand_initValidators = function _TeamsAppInstallCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (args.options.teamId &&
-            !validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
-        }
-        if (args.options.userId &&
-            !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _TeamsAppInstallCommand_initOptionSets = function _TeamsAppInstallCommand_initOptionSets() {
-    this.optionSets.push({ options: ['teamId', 'userId', 'userName'] });
-    this.optionSets.push({ options: ['id', 'name'] });
-};
 export default new TeamsAppInstallCommand();
 //# sourceMappingURL=app-install.js.map

package/dist/m365/teams/commands/app/app-list.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 _TeamsAppListCommand_instances, _a, _TeamsAppListCommand_initTelemetry, _TeamsAppListCommand_initOptions, _TeamsAppListCommand_initValidators;
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    distributionMethod: z.enum(['store', 'organization', 'sideloaded']).optional()
+});
 class TeamsAppListCommand extends GraphCommand {
     get name() {
         return commands.APP_LIST;
@@ -17,12 +17,8 @@ class TeamsAppListCommand extends GraphCommand {
     defaultProperties() {
         return ['id', 'displayName', 'distributionMethod'];
     }
-    constructor() {
-        super();
-        _TeamsAppListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TeamsAppListCommand_instances, "m", _TeamsAppListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsAppListCommand_instances, "m", _TeamsAppListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsAppListCommand_instances, "m", _TeamsAppListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -38,26 +34,5 @@ class TeamsAppListCommand extends GraphCommand {
         }
     }
 }
-_a = TeamsAppListCommand, _TeamsAppListCommand_instances = new WeakSet(), _TeamsAppListCommand_initTelemetry = function _TeamsAppListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            distributionMethod: args.options.distributionMethod || false
-        });
-    });
-}, _TeamsAppListCommand_initOptions = function _TeamsAppListCommand_initOptions() {
-    this.options.unshift({
-        option: '--distributionMethod [distributionMethod]',
-        autocomplete: _a.allowedDistributionMethods
-    });
-}, _TeamsAppListCommand_initValidators = function _TeamsAppListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.distributionMethod &&
-            _a.allowedDistributionMethods.indexOf(args.options.distributionMethod) < 0) {
-            return `'${args.options.distributionMethod}' is not a valid distributionMethod. Allowed distribution methods are: ${_a.allowedDistributionMethods.join(', ')}`;
-        }
-        return true;
-    });
-};
-TeamsAppListCommand.allowedDistributionMethods = ['store', 'organization', 'sideloaded'];
 export default new TeamsAppListCommand();
 //# sourceMappingURL=app-list.js.map

package/dist/m365/teams/commands/app/app-publish.js

@@ -1,14 +1,27 @@
-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 _TeamsAppPublishCommand_instances, _TeamsAppPublishCommand_initOptions, _TeamsAppPublishCommand_initValidators;
 import fs from 'fs';
 import path from 'path';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    filePath: z.string()
+        .refine(val => {
+        const fullPath = path.resolve(val);
+        if (!fs.existsSync(fullPath)) {
+            return false;
+        }
+        if (fs.lstatSync(fullPath).isDirectory()) {
+            return false;
+        }
+        return true;
+    }, {
+        message: 'Specified file does not exist or points to a directory.'
+    })
+        .alias('p')
+});
 class TeamsAppPublishCommand extends GraphCommand {
     get name() {
         return commands.APP_PUBLISH;
@@ -16,11 +29,8 @@ class TeamsAppPublishCommand extends GraphCommand {
     get description() {
         return 'Publishes Teams app to the organization\'s app catalog';
     }
-    constructor() {
-        super();
-        _TeamsAppPublishCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TeamsAppPublishCommand_instances, "m", _TeamsAppPublishCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsAppPublishCommand_instances, "m", _TeamsAppPublishCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -45,21 +55,5 @@ class TeamsAppPublishCommand extends GraphCommand {
         }
     }
 }
-_TeamsAppPublishCommand_instances = new WeakSet(), _TeamsAppPublishCommand_initOptions = function _TeamsAppPublishCommand_initOptions() {
-    this.options.unshift({
-        option: '-p, --filePath <filePath>'
-    });
-}, _TeamsAppPublishCommand_initValidators = function _TeamsAppPublishCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const fullPath = path.resolve(args.options.filePath);
-        if (!fs.existsSync(fullPath)) {
-            return `File '${fullPath}' not found`;
-        }
-        if (fs.lstatSync(fullPath).isDirectory()) {
-            return `Path '${fullPath}' points to a directory`;
-        }
-        return true;
-    });
-};
 export default new TeamsAppPublishCommand();
 //# sourceMappingURL=app-publish.js.map

package/dist/m365/teams/commands/app/app-remove.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 _TeamsAppRemoveCommand_instances, _TeamsAppRemoveCommand_initTelemetry, _TeamsAppRemoveCommand_initOptions, _TeamsAppRemoveCommand_initValidators, _TeamsAppRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    }).optional().alias('i'),
+    name: z.string().optional().alias('n'),
+    force: z.boolean().optional().alias('f')
+});
 class TeamsAppRemoveCommand extends GraphCommand {
     get name() {
         return commands.APP_REMOVE;
@@ -17,13 +21,18 @@ class TeamsAppRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes a Teams app from the organization\'s app catalog';
     }
-    constructor() {
-        super();
-        _TeamsAppRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TeamsAppRemoveCommand_instances, "m", _TeamsAppRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsAppRemoveCommand_instances, "m", _TeamsAppRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsAppRemoveCommand_instances, "m", _TeamsAppRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _TeamsAppRemoveCommand_instances, "m", _TeamsAppRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.name].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either id or name, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        });
     }
     async commandAction(logger, args) {
         const removeApp = async () => {
@@ -81,31 +90,5 @@ class TeamsAppRemoveCommand extends GraphCommand {
         return app.id;
     }
 }
-_TeamsAppRemoveCommand_instances = new WeakSet(), _TeamsAppRemoveCommand_initTelemetry = function _TeamsAppRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: (!(!args.options.force)).toString(),
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined'
-        });
-    });
-}, _TeamsAppRemoveCommand_initOptions = function _TeamsAppRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    }, {
-        option: '-f, --force'
-    });
-}, _TeamsAppRemoveCommand_initValidators = function _TeamsAppRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _TeamsAppRemoveCommand_initOptionSets = function _TeamsAppRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-};
 export default new TeamsAppRemoveCommand();
 //# sourceMappingURL=app-remove.js.map