@pnp/cli-microsoft365 11.10.0 → 11.11.0-beta.1cb40cb

package/dist/m365/pp/commands/dataverse/dataverse-table-remove.js

@@ -1,14 +1,17 @@
-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 _PpDataverseTableRemoveCommand_instances, _PpDataverseTableRemoveCommand_initTelemetry, _PpDataverseTableRemoveCommand_initOptions;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    environmentName: z.string().alias('e'),
+    name: z.string().alias('n'),
+    asAdmin: z.boolean().optional(),
+    force: z.boolean().optional().alias('f')
+});
 class PpDataverseTableRemoveCommand extends PowerPlatformCommand {
     get name() {
         return commands.DATAVERSE_TABLE_REMOVE;
@@ -16,11 +19,8 @@ class PpDataverseTableRemoveCommand extends PowerPlatformCommand {
     get description() {
         return 'Removes a dataverse table in a given environment';
     }
-    constructor() {
-        super();
-        _PpDataverseTableRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpDataverseTableRemoveCommand_instances, "m", _PpDataverseTableRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpDataverseTableRemoveCommand_instances, "m", _PpDataverseTableRemoveCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -53,23 +53,5 @@ class PpDataverseTableRemoveCommand extends PowerPlatformCommand {
         }
     }
 }
-_PpDataverseTableRemoveCommand_instances = new WeakSet(), _PpDataverseTableRemoveCommand_initTelemetry = function _PpDataverseTableRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            asAdmin: !!args.options.asAdmin,
-            force: !!args.options.force
-        });
-    });
-}, _PpDataverseTableRemoveCommand_initOptions = function _PpDataverseTableRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '-n, --name <name>'
-    }, {
-        option: '--asAdmin'
-    }, {
-        option: '-f, --force'
-    });
-};
 export default new PpDataverseTableRemoveCommand();
 //# sourceMappingURL=dataverse-table-remove.js.map

package/dist/m365/pp/commands/dataverse/dataverse-table-row-list.js

@@ -1,14 +1,17 @@
-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 _PpDataverseTableRowListCommand_instances, _PpDataverseTableRowListCommand_initTelemetry, _PpDataverseTableRowListCommand_initOptions, _PpDataverseTableRowListCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    environmentName: z.string().alias('e'),
+    entitySetName: z.string().optional(),
+    tableName: z.string().optional(),
+    asAdmin: z.boolean().optional()
+});
 class PpDataverseTableRowListCommand extends PowerPlatformCommand {
     get name() {
         return commands.DATAVERSE_TABLE_ROW_LIST;
@@ -16,12 +19,18 @@ class PpDataverseTableRowListCommand extends PowerPlatformCommand {
     get description() {
         return 'Lists table rows for the given Dataverse table';
     }
-    constructor() {
-        super();
-        _PpDataverseTableRowListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpDataverseTableRowListCommand_instances, "m", _PpDataverseTableRowListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpDataverseTableRowListCommand_instances, "m", _PpDataverseTableRowListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PpDataverseTableRowListCommand_instances, "m", _PpDataverseTableRowListCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.entitySetName, opts.tableName].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'entitySetName' or 'tableName', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['entitySetName', 'tableName']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -55,26 +64,5 @@ class PpDataverseTableRowListCommand extends PowerPlatformCommand {
         return response.EntitySetName;
     }
 }
-_PpDataverseTableRowListCommand_instances = new WeakSet(), _PpDataverseTableRowListCommand_initTelemetry = function _PpDataverseTableRowListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            entitySetName: typeof args.options.entitySetName !== 'undefined',
-            tableName: typeof args.options.tableName !== 'undefined',
-            asAdmin: !!args.options.asAdmin
-        });
-    });
-}, _PpDataverseTableRowListCommand_initOptions = function _PpDataverseTableRowListCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '--entitySetName [entitySetName]'
-    }, {
-        option: '--tableName [tableName]'
-    }, {
-        option: '--asAdmin'
-    });
-}, _PpDataverseTableRowListCommand_initOptionSets = function _PpDataverseTableRowListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['entitySetName', 'tableName'] });
-};
 export default new PpDataverseTableRowListCommand();
 //# sourceMappingURL=dataverse-table-row-list.js.map

package/dist/m365/pp/commands/dataverse/dataverse-table-row-remove.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 _PpDataverseTableRowRemoveCommand_instances, _PpDataverseTableRowRemoveCommand_initTelemetry, _PpDataverseTableRowRemoveCommand_initOptions, _PpDataverseTableRowRemoveCommand_initValidators, _PpDataverseTableRowRemoveCommand_initOptionSets;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    environmentName: z.string().alias('e'),
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        error: 'The value must be a valid GUID.'
+    }).alias('i'),
+    entitySetName: z.string().optional(),
+    tableName: z.string().optional(),
+    asAdmin: z.boolean().optional(),
+    force: z.boolean().optional().alias('f')
+});
 class PpDataverseTableRowRemoveCommand extends PowerPlatformCommand {
     get name() {
         return commands.DATAVERSE_TABLE_ROW_REMOVE;
@@ -17,13 +24,18 @@ class PpDataverseTableRowRemoveCommand extends PowerPlatformCommand {
     get description() {
         return 'Removes a specific row from a dataverse table in the specified Power Platform environment.';
     }
-    constructor() {
-        super();
-        _PpDataverseTableRowRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpDataverseTableRowRemoveCommand_instances, "m", _PpDataverseTableRowRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpDataverseTableRowRemoveCommand_instances, "m", _PpDataverseTableRowRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PpDataverseTableRowRemoveCommand_instances, "m", _PpDataverseTableRowRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PpDataverseTableRowRemoveCommand_instances, "m", _PpDataverseTableRowRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.entitySetName, opts.tableName].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'entitySetName' or 'tableName', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['entitySetName', 'tableName']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -74,38 +86,5 @@ class PpDataverseTableRowRemoveCommand extends PowerPlatformCommand {
         return response.EntitySetName;
     }
 }
-_PpDataverseTableRowRemoveCommand_instances = new WeakSet(), _PpDataverseTableRowRemoveCommand_initTelemetry = function _PpDataverseTableRowRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            entitySetName: typeof args.options.entitySetName !== 'undefined',
-            tableName: typeof args.options.tableName !== 'undefined',
-            asAdmin: !!args.options.asAdmin,
-            force: !!args.options.force
-        });
-    });
-}, _PpDataverseTableRowRemoveCommand_initOptions = function _PpDataverseTableRowRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '-i, --id <id>'
-    }, {
-        option: '--entitySetName [entitySetName]'
-    }, {
-        option: '--tableName [tableName]'
-    }, {
-        option: '--asAdmin'
-    }, {
-        option: '-f, --force'
-    });
-}, _PpDataverseTableRowRemoveCommand_initValidators = function _PpDataverseTableRowRemoveCommand_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;
-    });
-}, _PpDataverseTableRowRemoveCommand_initOptionSets = function _PpDataverseTableRowRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['entitySetName', 'tableName'] });
-};
 export default new PpDataverseTableRowRemoveCommand();
 //# sourceMappingURL=dataverse-table-row-remove.js.map

package/dist/m365/pp/commands/gateway/gateway-get.js

@@ -1,14 +1,16 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _PpGatewayGetCommand_instances, _PpGatewayGetCommand_initOptions, _PpGatewayGetCommand_initValidators;
+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 PowerBICommand from "../../../base/PowerBICommand.js";
 import commands from "../../commands.js";
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        error: 'The value must be a valid GUID.'
+    }).alias('i')
+});
 class PpGatewayGetCommand extends PowerBICommand {
     get name() {
         return commands.GATEWAY_GET;
@@ -16,11 +18,8 @@ class PpGatewayGetCommand extends PowerBICommand {
     get description() {
         return "Gets information about the specified gateway.";
     }
-    constructor() {
-        super();
-        _PpGatewayGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpGatewayGetCommand_instances, "m", _PpGatewayGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PpGatewayGetCommand_instances, "m", _PpGatewayGetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -42,17 +41,5 @@ class PpGatewayGetCommand extends PowerBICommand {
         return request.get(requestOptions);
     }
 }
-_PpGatewayGetCommand_instances = new WeakSet(), _PpGatewayGetCommand_initOptions = function _PpGatewayGetCommand_initOptions() {
-    this.options.unshift({
-        option: "-i, --id <id>"
-    });
-}, _PpGatewayGetCommand_initValidators = function _PpGatewayGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        return true;
-    });
-};
 export default new PpGatewayGetCommand();
 //# sourceMappingURL=gateway-get.js.map

package/dist/m365/pp/commands/managementapp/managementapp-add.js

@@ -1,14 +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 _PpManagementAppAddCommand_instances, _PpManagementAppAddCommand_initTelemetry, _PpManagementAppAddCommand_initOptions, _PpManagementAppAddCommand_initValidators, _PpManagementAppAddCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
 import { entraApp } from '../../../../utils/entraApp.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    appId: z.string().refine(val => validation.isValidGuid(val), {
+        error: 'The value must be a valid GUID.'
+    }).optional(),
+    objectId: z.string().refine(val => validation.isValidGuid(val), {
+        error: 'The value must be a valid GUID.'
+    }).optional(),
+    name: z.string().optional()
+});
 class PpManagementAppAddCommand extends PowerPlatformCommand {
     get name() {
         return commands.MANAGEMENTAPP_ADD;
@@ -16,13 +22,18 @@ class PpManagementAppAddCommand extends PowerPlatformCommand {
     get description() {
         return 'Registers management application for Power Platform';
     }
-    constructor() {
-        super();
-        _PpManagementAppAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpManagementAppAddCommand_instances, "m", _PpManagementAppAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpManagementAppAddCommand_instances, "m", _PpManagementAppAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PpManagementAppAddCommand_instances, "m", _PpManagementAppAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PpManagementAppAddCommand_instances, "m", _PpManagementAppAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.appId, opts.objectId, opts.name].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'appId', 'objectId', or 'name', but not multiple.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['appId', 'objectId', 'name']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -57,28 +68,5 @@ class PpManagementAppAddCommand extends PowerPlatformCommand {
         }
     }
 }
-_PpManagementAppAddCommand_instances = new WeakSet(), _PpManagementAppAddCommand_initTelemetry = function _PpManagementAppAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appId: typeof args.options.appId !== 'undefined',
-            objectId: typeof args.options.objectId !== 'undefined',
-            name: typeof args.options.name !== 'undefined'
-        });
-    });
-}, _PpManagementAppAddCommand_initOptions = function _PpManagementAppAddCommand_initOptions() {
-    this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '--name [name]' });
-}, _PpManagementAppAddCommand_initValidators = function _PpManagementAppAddCommand_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.objectId && !validation.isValidGuid(args.options.objectId)) {
-            return `${args.options.objectId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _PpManagementAppAddCommand_initOptionSets = function _PpManagementAppAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'objectId', 'name'] });
-};
 export default new PpManagementAppAddCommand();
 //# sourceMappingURL=managementapp-add.js.map

package/dist/m365/pp/commands/managementapp/managementapp-list.js

@@ -1,6 +1,8 @@
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
+export const options = globalOptionsZod.strict();
 class PpManagementAppListCommand extends PowerPlatformCommand {
     get name() {
         return commands.MANAGEMENTAPP_LIST;
@@ -8,6 +10,9 @@ class PpManagementAppListCommand extends PowerPlatformCommand {
     get description() {
         return 'Lists management applications for Power Platform';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         const endpoint = `${this.resource}/providers/Microsoft.BusinessAppPlatform/adminApplications?api-version=2020-06-01`;
         try {

package/dist/m365/pp/commands/solution/solution-get.js

@@ -1,15 +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 _PpSolutionGetCommand_instances, _PpSolutionGetCommand_initTelemetry, _PpSolutionGetCommand_initOptions, _PpSolutionGetCommand_initOptionSets, _PpSolutionGetCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    environmentName: z.string().alias('e'),
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        error: 'The value must be a valid GUID.'
+    }).optional().alias('i'),
+    name: z.string().optional().alias('n'),
+    asAdmin: z.boolean().optional()
+});
 class PpSolutionGetCommand extends PowerPlatformCommand {
     get name() {
         return commands.SOLUTION_GET;
@@ -17,13 +22,18 @@ class PpSolutionGetCommand extends PowerPlatformCommand {
     get description() {
         return 'Gets a specific solution in a given environment.';
     }
-    constructor() {
-        super();
-        _PpSolutionGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpSolutionGetCommand_instances, "m", _PpSolutionGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpSolutionGetCommand_instances, "m", _PpSolutionGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PpSolutionGetCommand_instances, "m", _PpSolutionGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PpSolutionGetCommand_instances, "m", _PpSolutionGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.name].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'id' or 'name', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -62,33 +72,5 @@ class PpSolutionGetCommand extends PowerPlatformCommand {
         return request.get(requestOptions);
     }
 }
-_PpSolutionGetCommand_instances = new WeakSet(), _PpSolutionGetCommand_initTelemetry = function _PpSolutionGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined',
-            asAdmin: !!args.options.asAdmin
-        });
-    });
-}, _PpSolutionGetCommand_initOptions = function _PpSolutionGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    }, {
-        option: '--asAdmin'
-    });
-}, _PpSolutionGetCommand_initOptionSets = function _PpSolutionGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-}, _PpSolutionGetCommand_initValidators = function _PpSolutionGetCommand_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;
-    });
-};
 export default new PpSolutionGetCommand();
 //# sourceMappingURL=solution-get.js.map

package/dist/m365/pp/commands/solution/solution-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 _PpSolutionListCommand_instances, _PpSolutionListCommand_initTelemetry, _PpSolutionListCommand_initOptions;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    environmentName: z.string().alias('e'),
+    asAdmin: z.boolean().optional()
+});
 class PpSolutionListCommand extends PowerPlatformCommand {
     get name() {
         return commands.SOLUTION_LIST;
@@ -19,11 +20,8 @@ class PpSolutionListCommand extends PowerPlatformCommand {
     defaultProperties() {
         return ['uniquename', 'version', 'publisher'];
     }
-    constructor() {
-        super();
-        _PpSolutionListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpSolutionListCommand_instances, "m", _PpSolutionListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpSolutionListCommand_instances, "m", _PpSolutionListCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -52,18 +50,5 @@ class PpSolutionListCommand extends PowerPlatformCommand {
         }
     }
 }
-_PpSolutionListCommand_instances = new WeakSet(), _PpSolutionListCommand_initTelemetry = function _PpSolutionListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            asAdmin: !!args.options.asAdmin
-        });
-    });
-}, _PpSolutionListCommand_initOptions = function _PpSolutionListCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '--asAdmin'
-    });
-};
 export default new PpSolutionListCommand();
 //# sourceMappingURL=solution-list.js.map

package/dist/m365/pp/commands/solution/solution-publish.js

@@ -1,15 +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 _PpSolutionPublishCommand_instances, _PpSolutionPublishCommand_initTelemetry, _PpSolutionPublishCommand_initOptions, _PpSolutionPublishCommand_initOptionSets, _PpSolutionPublishCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    environmentName: z.string().alias('e'),
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        error: 'The value must be a valid GUID.'
+    }).optional().alias('i'),
+    name: z.string().optional().alias('n'),
+    asAdmin: z.boolean().optional(),
+    wait: z.boolean().optional()
+});
 class PpSolutionPublishCommand extends PowerPlatformCommand {
     get name() {
         return commands.SOLUTION_PUBLISH;
@@ -17,17 +23,22 @@ class PpSolutionPublishCommand extends PowerPlatformCommand {
     get description() {
         return 'Publishes the components of a solution in a given Power Platform environment';
     }
-    constructor() {
-        super();
-        _PpSolutionPublishCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpSolutionPublishCommand_instances, "m", _PpSolutionPublishCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpSolutionPublishCommand_instances, "m", _PpSolutionPublishCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PpSolutionPublishCommand_instances, "m", _PpSolutionPublishCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PpSolutionPublishCommand_instances, "m", _PpSolutionPublishCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.name].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'id' or 'name', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
-            const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+            const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
             const solutionId = await this.getSolutionId(args, dynamicsApiUrl, logger);
             const solutionComponents = await this.getSolutionComponents(dynamicsApiUrl, solutionId, logger);
             const parameterXml = await this.buildXmlRequestObject(solutionComponents, logger);
@@ -94,36 +105,5 @@ class PpSolutionPublishCommand extends PowerPlatformCommand {
         return `<importexportxml>${formatting.objectToXml(result)}</importexportxml>`;
     }
 }
-_PpSolutionPublishCommand_instances = new WeakSet(), _PpSolutionPublishCommand_initTelemetry = function _PpSolutionPublishCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined',
-            asAdmin: !!args.options.asAdmin,
-            wait: !!args.options.wait
-        });
-    });
-}, _PpSolutionPublishCommand_initOptions = function _PpSolutionPublishCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    }, {
-        option: '--asAdmin'
-    }, {
-        option: '--wait'
-    });
-}, _PpSolutionPublishCommand_initOptionSets = function _PpSolutionPublishCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-}, _PpSolutionPublishCommand_initValidators = function _PpSolutionPublishCommand_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;
-    });
-};
 export default new PpSolutionPublishCommand();
 //# sourceMappingURL=solution-publish.js.map