@pnp/cli-microsoft365 11.9.0-beta.93bd508 → 11.9.0-beta.9bd71dd

package/dist/m365/entra/commands/approleassignment/approleassignment-add.js

@@ -1,16 +1,20 @@
-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 _EntraAppRoleAssignmentAddCommand_instances, _EntraAppRoleAssignmentAddCommand_initTelemetry, _EntraAppRoleAssignmentAddCommand_initOptions, _EntraAppRoleAssignmentAddCommand_initValidators, _EntraAppRoleAssignmentAddCommand_initOptionSets;
 import os from 'os';
+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 GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { cli } from '../../../../cli/cli.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    appId: z.uuid().optional(),
+    appObjectId: z.uuid().optional(),
+    appDisplayName: z.string().optional(),
+    resource: z.string().alias('r'),
+    scopes: z.string().transform((value) => value.split(',').map(String)).alias('s')
+});
 class EntraAppRoleAssignmentAddCommand extends GraphCommand {
     get name() {
         return commands.APPROLEASSIGNMENT_ADD;
@@ -18,13 +22,18 @@ class EntraAppRoleAssignmentAddCommand extends GraphCommand {
     get description() {
         return 'Adds service principal permissions also known as scopes and app role assignments for specified Microsoft Entra application registration';
     }
-    constructor() {
-        super();
-        _EntraAppRoleAssignmentAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentAddCommand_instances, "m", _EntraAppRoleAssignmentAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentAddCommand_instances, "m", _EntraAppRoleAssignmentAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentAddCommand_instances, "m", _EntraAppRoleAssignmentAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentAddCommand_instances, "m", _EntraAppRoleAssignmentAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.appId, options.appObjectId, options.appDisplayName].filter(o => o !== undefined).length === 1, {
+            error: 'Specify either appId, appObjectId, or appDisplayName',
+            params: {
+                customCode: 'optionSet',
+                options: ['appId', 'appObjectId', 'appDisplayName']
+            }
+        });
     }
     async commandAction(logger, args) {
         let objectId;
@@ -100,7 +109,7 @@ class EntraAppRoleAssignmentAddCommand extends GraphCommand {
                 throw `The resource '${args.options.resource}' does not have any application permissions available.`;
             }
             // search for match between the found app roles and the specified scopes option value
-            for (const scope of args.options.scopes.split(',')) {
+            for (const scope of args.options.scopes) {
                 const existingRoles = appRolesFound.filter((role) => {
                     return role.value.toLocaleLowerCase() === scope.toLocaleLowerCase().trim();
                 });
@@ -149,39 +158,5 @@ class EntraAppRoleAssignmentAddCommand extends GraphCommand {
         return request.post(requestOptions);
     }
 }
-_EntraAppRoleAssignmentAddCommand_instances = new WeakSet(), _EntraAppRoleAssignmentAddCommand_initTelemetry = function _EntraAppRoleAssignmentAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appId: typeof args.options.appId !== 'undefined',
-            appObjectId: typeof args.options.appObjectId !== 'undefined',
-            appDisplayName: typeof args.options.appDisplayName !== 'undefined'
-        });
-    });
-}, _EntraAppRoleAssignmentAddCommand_initOptions = function _EntraAppRoleAssignmentAddCommand_initOptions() {
-    this.options.unshift({
-        option: '--appId [appId]'
-    }, {
-        option: '--appObjectId [appObjectId]'
-    }, {
-        option: '--appDisplayName [appDisplayName]'
-    }, {
-        option: '-r, --resource <resource>',
-        autocomplete: ['Microsoft Graph', 'SharePoint', 'OneNote', 'Exchange', 'Microsoft Forms', 'Azure Active Directory Graph', 'Skype for Business']
-    }, {
-        option: '-s, --scopes <scopes>'
-    });
-}, _EntraAppRoleAssignmentAddCommand_initValidators = function _EntraAppRoleAssignmentAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid GUID`;
-        }
-        if (args.options.appObjectId && !validation.isValidGuid(args.options.appObjectId)) {
-            return `${args.options.appObjectId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraAppRoleAssignmentAddCommand_initOptionSets = function _EntraAppRoleAssignmentAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'appObjectId', 'appDisplayName'] });
-};
 export default new EntraAppRoleAssignmentAddCommand();
 //# sourceMappingURL=approleassignment-add.js.map

package/dist/m365/entra/commands/approleassignment/approleassignment-list.js

@@ -1,14 +1,15 @@
-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 _EntraAppRoleAssignmentListCommand_instances, _EntraAppRoleAssignmentListCommand_initTelemetry, _EntraAppRoleAssignmentListCommand_initOptions, _EntraAppRoleAssignmentListCommand_initValidators, _EntraAppRoleAssignmentListCommand_initOptionSets;
+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 GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    appId: z.uuid().optional().alias('i'),
+    appDisplayName: z.string().optional().alias('n'),
+    appObjectId: z.uuid().optional()
+});
 class EntraAppRoleAssignmentListCommand extends GraphCommand {
     get name() {
         return commands.APPROLEASSIGNMENT_LIST;
@@ -16,13 +17,18 @@ class EntraAppRoleAssignmentListCommand extends GraphCommand {
     get description() {
         return 'Lists app role assignments for the specified application registration';
     }
-    constructor() {
-        super();
-        _EntraAppRoleAssignmentListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentListCommand_instances, "m", _EntraAppRoleAssignmentListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentListCommand_instances, "m", _EntraAppRoleAssignmentListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentListCommand_instances, "m", _EntraAppRoleAssignmentListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentListCommand_instances, "m", _EntraAppRoleAssignmentListCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.appId, options.appObjectId, options.appDisplayName].filter(o => o !== undefined).length === 1, {
+            error: 'Specify either appId, appObjectId, or appDisplayName',
+            params: {
+                customCode: 'optionSet',
+                options: ['appId', 'appObjectId', 'appDisplayName']
+            }
+        });
     }
     defaultProperties() {
         return ['resourceDisplayName', 'roleName'];
@@ -115,34 +121,5 @@ class EntraAppRoleAssignmentListCommand extends GraphCommand {
         return request.get(spRequestOptions);
     }
 }
-_EntraAppRoleAssignmentListCommand_instances = new WeakSet(), _EntraAppRoleAssignmentListCommand_initTelemetry = function _EntraAppRoleAssignmentListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appId: typeof args.options.appId !== 'undefined',
-            appDisplayName: typeof args.options.appDisplayName !== 'undefined',
-            appObjectId: typeof args.options.appObjectId !== 'undefined'
-        });
-    });
-}, _EntraAppRoleAssignmentListCommand_initOptions = function _EntraAppRoleAssignmentListCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --appId [appId]'
-    }, {
-        option: '-n, --appDisplayName [appDisplayName]'
-    }, {
-        option: '--appObjectId [appObjectId]'
-    });
-}, _EntraAppRoleAssignmentListCommand_initValidators = function _EntraAppRoleAssignmentListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid GUID`;
-        }
-        if (args.options.appObjectId && !validation.isValidGuid(args.options.appObjectId)) {
-            return `${args.options.appObjectId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraAppRoleAssignmentListCommand_initOptionSets = function _EntraAppRoleAssignmentListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'appObjectId', 'appDisplayName'] });
-};
 export default new EntraAppRoleAssignmentListCommand();
 //# sourceMappingURL=approleassignment-list.js.map

package/dist/m365/entra/commands/approleassignment/approleassignment-remove.js

@@ -1,16 +1,21 @@
-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 _EntraAppRoleAssignmentRemoveCommand_instances, _EntraAppRoleAssignmentRemoveCommand_initTelemetry, _EntraAppRoleAssignmentRemoveCommand_initOptions, _EntraAppRoleAssignmentRemoveCommand_initValidators, _EntraAppRoleAssignmentRemoveCommand_initOptionSets;
 import os from 'os';
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    appId: z.uuid().optional(),
+    appObjectId: z.uuid().optional(),
+    appDisplayName: z.string().optional(),
+    resource: z.string().alias('r'),
+    scopes: z.string().transform((value) => value.split(',').map(String)).alias('s'),
+    force: z.boolean().optional().alias('f')
+});
 class EntraAppRoleAssignmentRemoveCommand extends GraphCommand {
     get name() {
         return commands.APPROLEASSIGNMENT_REMOVE;
@@ -18,13 +23,18 @@ class EntraAppRoleAssignmentRemoveCommand extends GraphCommand {
     get description() {
         return 'Deletes an app role assignment for the specified Entra Application Registration';
     }
-    constructor() {
-        super();
-        _EntraAppRoleAssignmentRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentRemoveCommand_instances, "m", _EntraAppRoleAssignmentRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentRemoveCommand_instances, "m", _EntraAppRoleAssignmentRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentRemoveCommand_instances, "m", _EntraAppRoleAssignmentRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentRemoveCommand_instances, "m", _EntraAppRoleAssignmentRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.appId, options.appObjectId, options.appDisplayName].filter(o => o !== undefined).length === 1, {
+            error: 'Specify either appId, appObjectId, or appDisplayName',
+            params: {
+                customCode: 'optionSet',
+                options: ['appId', 'appObjectId', 'appDisplayName']
+            }
+        });
     }
     async commandAction(logger, args) {
         const removeAppRoleAssignment = async () => {
@@ -80,7 +90,7 @@ class EntraAppRoleAssignmentRemoveCommand extends GraphCommand {
                 if (!appRolesFound.length) {
                     throw `The resource '${args.options.resource}' does not have any application permissions available.`;
                 }
-                for (const scope of args.options.scopes.split(',')) {
+                for (const scope of args.options.scopes) {
                     const existingRoles = appRolesFound.filter((role) => {
                         return role.value.toLocaleLowerCase() === scope.toLocaleLowerCase().trim();
                     });
@@ -138,42 +148,5 @@ class EntraAppRoleAssignmentRemoveCommand extends GraphCommand {
         return request.delete(spRequestOptions);
     }
 }
-_EntraAppRoleAssignmentRemoveCommand_instances = new WeakSet(), _EntraAppRoleAssignmentRemoveCommand_initTelemetry = function _EntraAppRoleAssignmentRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appId: typeof args.options.appId !== 'undefined',
-            appDisplayName: typeof args.options.appDisplayName !== 'undefined',
-            appObjectId: typeof args.options.appObjectId !== 'undefined',
-            force: (!!args.options.force).toString()
-        });
-    });
-}, _EntraAppRoleAssignmentRemoveCommand_initOptions = function _EntraAppRoleAssignmentRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '--appId [appId]'
-    }, {
-        option: '--appObjectId [appObjectId]'
-    }, {
-        option: '--appDisplayName [appDisplayName]'
-    }, {
-        option: '-r, --resource <resource>',
-        autocomplete: ['Microsoft Graph', 'SharePoint', 'OneNote', 'Exchange', 'Microsoft Forms', 'Azure Active Directory Graph', 'Skype for Business']
-    }, {
-        option: '-s, --scopes <scopes>'
-    }, {
-        option: '-f, --force'
-    });
-}, _EntraAppRoleAssignmentRemoveCommand_initValidators = function _EntraAppRoleAssignmentRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid GUID`;
-        }
-        if (args.options.appObjectId && !validation.isValidGuid(args.options.appObjectId)) {
-            return `${args.options.appObjectId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraAppRoleAssignmentRemoveCommand_initOptionSets = function _EntraAppRoleAssignmentRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'appObjectId', 'appDisplayName'] });
-};
 export default new EntraAppRoleAssignmentRemoveCommand();
 //# sourceMappingURL=approleassignment-remove.js.map

package/dist/m365/entra/commands/enterpriseapp/enterpriseapp-add.js

@@ -1,15 +1,16 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _EntraEnterpriseAppAddCommand_instances, _EntraEnterpriseAppAddCommand_initTelemetry, _EntraEnterpriseAppAddCommand_initOptions, _EntraEnterpriseAppAddCommand_initValidators, _EntraEnterpriseAppAddCommand_initOptionSets;
+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 GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { cli } from '../../../../cli/cli.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.uuid().optional().alias('i'),
+    displayName: z.string().optional().alias('n'),
+    objectId: z.uuid().optional()
+});
 class EntraEnterpriseAppAddCommand extends GraphCommand {
     get name() {
         return commands.ENTERPRISEAPP_ADD;
@@ -20,13 +21,18 @@ class EntraEnterpriseAppAddCommand extends GraphCommand {
     alias() {
         return [commands.SP_ADD];
     }
-    constructor() {
-        super();
-        _EntraEnterpriseAppAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraEnterpriseAppAddCommand_instances, "m", _EntraEnterpriseAppAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraEnterpriseAppAddCommand_instances, "m", _EntraEnterpriseAppAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraEnterpriseAppAddCommand_instances, "m", _EntraEnterpriseAppAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraEnterpriseAppAddCommand_instances, "m", _EntraEnterpriseAppAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.id, options.displayName, options.objectId].filter(o => o !== undefined).length === 1, {
+            error: 'Specify either id, displayName, or objectId',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName', 'objectId']
+            }
+        });
     }
     async getAppId(args) {
         if (args.options.id) {
@@ -80,34 +86,5 @@ class EntraEnterpriseAppAddCommand extends GraphCommand {
         }
     }
 }
-_EntraEnterpriseAppAddCommand_instances = new WeakSet(), _EntraEnterpriseAppAddCommand_initTelemetry = function _EntraEnterpriseAppAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            displayName: (!(!args.options.displayName)).toString(),
-            objectId: (!(!args.options.objectId)).toString()
-        });
-    });
-}, _EntraEnterpriseAppAddCommand_initOptions = function _EntraEnterpriseAppAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --displayName [displayName]'
-    }, {
-        option: '--objectId [objectId]'
-    });
-}, _EntraEnterpriseAppAddCommand_initValidators = function _EntraEnterpriseAppAddCommand_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.objectId && !validation.isValidGuid(args.options.objectId)) {
-            return `${args.options.objectId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraEnterpriseAppAddCommand_initOptionSets = function _EntraEnterpriseAppAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'displayName', 'objectId'] });
-};
 export default new EntraEnterpriseAppAddCommand();
 //# sourceMappingURL=enterpriseapp-add.js.map

package/dist/m365/entra/commands/enterpriseapp/enterpriseapp-get.js

@@ -1,15 +1,16 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _EntraEnterpriseAppGetCommand_instances, _EntraEnterpriseAppGetCommand_initTelemetry, _EntraEnterpriseAppGetCommand_initOptions, _EntraEnterpriseAppGetCommand_initValidators, _EntraEnterpriseAppGetCommand_initOptionSets;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
-import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.uuid().optional().alias('i'),
+    displayName: z.string().optional().alias('n'),
+    objectId: z.uuid().optional()
+});
 class EntraEnterpriseAppGetCommand extends GraphCommand {
     get name() {
         return commands.ENTERPRISEAPP_GET;
@@ -20,13 +21,18 @@ class EntraEnterpriseAppGetCommand extends GraphCommand {
     alias() {
         return [commands.SP_GET];
     }
-    constructor() {
-        super();
-        _EntraEnterpriseAppGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraEnterpriseAppGetCommand_instances, "m", _EntraEnterpriseAppGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraEnterpriseAppGetCommand_instances, "m", _EntraEnterpriseAppGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraEnterpriseAppGetCommand_instances, "m", _EntraEnterpriseAppGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraEnterpriseAppGetCommand_instances, "m", _EntraEnterpriseAppGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.id, options.displayName, options.objectId].filter(o => o !== undefined).length === 1, {
+            error: 'Specify either id, displayName, or objectId',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName', 'objectId']
+            }
+        });
     }
     async getSpId(args) {
         if (args.options.objectId) {
@@ -80,34 +86,5 @@ class EntraEnterpriseAppGetCommand extends GraphCommand {
         }
     }
 }
-_EntraEnterpriseAppGetCommand_instances = new WeakSet(), _EntraEnterpriseAppGetCommand_initTelemetry = function _EntraEnterpriseAppGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            displayName: (!(!args.options.displayName)).toString(),
-            objectId: (!(!args.options.objectId)).toString()
-        });
-    });
-}, _EntraEnterpriseAppGetCommand_initOptions = function _EntraEnterpriseAppGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --displayName [displayName]'
-    }, {
-        option: '--objectId [objectId]'
-    });
-}, _EntraEnterpriseAppGetCommand_initValidators = function _EntraEnterpriseAppGetCommand_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.objectId && !validation.isValidGuid(args.options.objectId)) {
-            return `${args.options.objectId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraEnterpriseAppGetCommand_initOptionSets = function _EntraEnterpriseAppGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'displayName', 'objectId'] });
-};
 export default new EntraEnterpriseAppGetCommand();
 //# sourceMappingURL=enterpriseapp-get.js.map

package/dist/m365/entra/commands/enterpriseapp/enterpriseapp-list.js

@@ -1,12 +1,13 @@
-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 _EntraEnterpriseAppListCommand_instances, _EntraEnterpriseAppListCommand_initTelemetry, _EntraEnterpriseAppListCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    displayName: z.string().optional().alias('n'),
+    tag: z.string().optional()
+});
 class EntraEnterpriseAppListCommand extends GraphCommand {
     get name() {
         return commands.ENTERPRISEAPP_LIST;
@@ -20,11 +21,8 @@ class EntraEnterpriseAppListCommand extends GraphCommand {
     alias() {
         return [commands.SP_LIST];
     }
-    constructor() {
-        super();
-        _EntraEnterpriseAppListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraEnterpriseAppListCommand_instances, "m", _EntraEnterpriseAppListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraEnterpriseAppListCommand_instances, "m", _EntraEnterpriseAppListCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -50,19 +48,5 @@ class EntraEnterpriseAppListCommand extends GraphCommand {
         }
     }
 }
-_EntraEnterpriseAppListCommand_instances = new WeakSet(), _EntraEnterpriseAppListCommand_initTelemetry = function _EntraEnterpriseAppListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            displayName: typeof args.options.displayName !== 'undefined',
-            tag: typeof args.options.tag !== 'undefined'
-        });
-    });
-}, _EntraEnterpriseAppListCommand_initOptions = function _EntraEnterpriseAppListCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --displayName [displayName]'
-    }, {
-        option: '--tag [tag]'
-    });
-};
 export default new EntraEnterpriseAppListCommand();
 //# sourceMappingURL=enterpriseapp-list.js.map

package/dist/m365/entra/commands/enterpriseapp/enterpriseapp-remove.js

@@ -1,16 +1,18 @@
-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 _EntraEnterpriseAppRemoveCommand_instances, _EntraEnterpriseAppRemoveCommand_initTelemetry, _EntraEnterpriseAppRemoveCommand_initOptions, _EntraEnterpriseAppRemoveCommand_initValidators, _EntraEnterpriseAppRemoveCommand_initOptionSets, _EntraEnterpriseAppRemoveCommand_initTypes;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.js';
 import { formatting } from '../../../../utils/formatting.js';
-import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.uuid().optional().alias('i'),
+    displayName: z.string().optional().alias('n'),
+    objectId: z.uuid().optional(),
+    force: z.boolean().optional().alias('f')
+});
 class EntraEnterpriseAppRemoveCommand extends GraphCommand {
     get name() {
         return commands.ENTERPRISEAPP_REMOVE;
@@ -21,14 +23,18 @@ class EntraEnterpriseAppRemoveCommand extends GraphCommand {
     alias() {
         return [commands.SP_REMOVE];
     }
-    constructor() {
-        super();
-        _EntraEnterpriseAppRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraEnterpriseAppRemoveCommand_instances, "m", _EntraEnterpriseAppRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraEnterpriseAppRemoveCommand_instances, "m", _EntraEnterpriseAppRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraEnterpriseAppRemoveCommand_instances, "m", _EntraEnterpriseAppRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraEnterpriseAppRemoveCommand_instances, "m", _EntraEnterpriseAppRemoveCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraEnterpriseAppRemoveCommand_instances, "m", _EntraEnterpriseAppRemoveCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.id, options.displayName, options.objectId].filter(o => o !== undefined).length === 1, {
+            error: 'Specify either id, displayName, or objectId',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName', 'objectId']
+            }
+        });
     }
     async commandAction(logger, args) {
         const removeEnterpriseApplication = async () => {
@@ -84,40 +90,5 @@ class EntraEnterpriseAppRemoveCommand extends GraphCommand {
         return spItem.id;
     }
 }
-_EntraEnterpriseAppRemoveCommand_instances = new WeakSet(), _EntraEnterpriseAppRemoveCommand_initTelemetry = function _EntraEnterpriseAppRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined',
-            objectId: typeof args.options.objectId !== 'undefined',
-            force: !!args.options.force
-        });
-    });
-}, _EntraEnterpriseAppRemoveCommand_initOptions = function _EntraEnterpriseAppRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --displayName [displayName]'
-    }, {
-        option: '--objectId [objectId]'
-    }, {
-        option: '-f, --force'
-    });
-}, _EntraEnterpriseAppRemoveCommand_initValidators = function _EntraEnterpriseAppRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `The option 'id' with value '${args.options.id}' is not a valid GUID.`;
-        }
-        if (args.options.objectId && !validation.isValidGuid(args.options.objectId)) {
-            return `The option 'objectId' with value '${args.options.objectId}' is not a valid GUID.`;
-        }
-        return true;
-    });
-}, _EntraEnterpriseAppRemoveCommand_initOptionSets = function _EntraEnterpriseAppRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'displayName', 'objectId'] });
-}, _EntraEnterpriseAppRemoveCommand_initTypes = function _EntraEnterpriseAppRemoveCommand_initTypes() {
-    this.types.string.push('id', 'displayName', 'objectId');
-    this.types.boolean.push('force');
-};
 export default new EntraEnterpriseAppRemoveCommand();
 //# sourceMappingURL=enterpriseapp-remove.js.map