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

package/dist/m365/pp/commands/solution/solution-publisher-add.js

@@ -1,13 +1,30 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _PpSolutionPublisherAddCommand_instances, _PpSolutionPublisherAddCommand_initTelemetry, _PpSolutionPublisherAddCommand_initOptions, _PpSolutionPublisherAddCommand_initValidators;
+import { z } from 'zod';
+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()
+        .refine(val => /^[a-zA-Z_][A-Za-z0-9_]+$/.test(val), {
+        error: 'Option name may only consist of alphanumeric characters and underscores. The first character cannot be a number.'
+    }).alias('n'),
+    displayName: z.string(),
+    prefix: z.string()
+        .refine(val => /^(?!mscrm.*$)[a-zA-Z][A-Za-z0-9]{1,7}$/.test(val), {
+        error: `Option prefix may only consist of alphanumeric characters. The first character cannot be a number and may not start with 'mscrm'. It must be between 2 and 8 characters long.`
+    }),
+    choiceValuePrefix: z.string()
+        .refine(val => {
+        const num = Number(val);
+        return Number.isInteger(num) && num >= 10000 && num <= 99999;
+    }, {
+        error: 'Option choiceValuePrefix should be an integer between 10000 and 99999.'
+    }),
+    asAdmin: z.boolean().optional()
+});
 class PpSolutionPublisherAddCommand extends PowerPlatformCommand {
     get name() {
         return commands.SOLUTION_PUBLISHER_ADD;
@@ -15,12 +32,8 @@ class PpSolutionPublisherAddCommand extends PowerPlatformCommand {
     get description() {
         return 'Adds a specified publisher in a given environment';
     }
-    constructor() {
-        super();
-        _PpSolutionPublisherAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpSolutionPublisherAddCommand_instances, "m", _PpSolutionPublisherAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpSolutionPublisherAddCommand_instances, "m", _PpSolutionPublisherAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PpSolutionPublisherAddCommand_instances, "m", _PpSolutionPublisherAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -38,7 +51,7 @@ class PpSolutionPublisherAddCommand extends PowerPlatformCommand {
                     uniquename: args.options.name,
                     friendlyname: args.options.displayName,
                     customizationprefix: args.options.prefix,
-                    customizationoptionvalueprefix: args.options.choiceValuePrefix
+                    customizationoptionvalueprefix: Number(args.options.choiceValuePrefix)
                 }
             };
             await request.post(requestOptions);
@@ -48,41 +61,5 @@ class PpSolutionPublisherAddCommand extends PowerPlatformCommand {
         }
     }
 }
-_PpSolutionPublisherAddCommand_instances = new WeakSet(), _PpSolutionPublisherAddCommand_initTelemetry = function _PpSolutionPublisherAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            asAdmin: !!args.options.asAdmin
-        });
-    });
-}, _PpSolutionPublisherAddCommand_initOptions = function _PpSolutionPublisherAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '-n, --name <name>'
-    }, {
-        option: '--displayName <displayName>'
-    }, {
-        option: '--prefix <prefix>'
-    }, {
-        option: '--choiceValuePrefix <choiceValuePrefix>'
-    }, {
-        option: '--asAdmin'
-    });
-}, _PpSolutionPublisherAddCommand_initValidators = function _PpSolutionPublisherAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (isNaN(args.options.choiceValuePrefix) || args.options.choiceValuePrefix < 10000 || args.options.choiceValuePrefix > 99999 || !Number.isInteger(args.options.choiceValuePrefix)) {
-            return 'Option choiceValuePrefix should be an integer between 10000 and 99999.';
-        }
-        const nameRegEx = new RegExp(/^[a-zA-Z_][A-Za-z0-9_]+$/);
-        if (!nameRegEx.test(args.options.name)) {
-            return 'Option name may only consist of alphanumeric characters and underscores. The first character cannot be a number.';
-        }
-        const prefixRegEx = new RegExp(/^(?!mscrm.*$)[a-zA-Z][A-Za-z0-9]{1,7}$/);
-        if (!prefixRegEx.test(args.options.prefix)) {
-            return `Option prefix may only consist of alphanumeric characters. The first character cannot be a number and may not start with 'mscrm'. It must be between 2 and 8 characters long.`;
-        }
-        return true;
-    });
-};
 export default new PpSolutionPublisherAddCommand();
 //# sourceMappingURL=solution-publisher-add.js.map

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

@@ -1,14 +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 _PpSolutionPublisherGetCommand_instances, _PpSolutionPublisherGetCommand_initTelemetry, _PpSolutionPublisherGetCommand_initOptions, _PpSolutionPublisherGetCommand_initOptionSets, _PpSolutionPublisherGetCommand_initValidators;
+import { z } from 'zod';
+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 PpSolutionPublisherGetCommand extends PowerPlatformCommand {
     get name() {
         return commands.SOLUTION_PUBLISHER_GET;
@@ -16,13 +21,18 @@ class PpSolutionPublisherGetCommand extends PowerPlatformCommand {
     get description() {
         return 'Gets information about the specified publisher in a given environment.';
     }
-    constructor() {
-        super();
-        _PpSolutionPublisherGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpSolutionPublisherGetCommand_instances, "m", _PpSolutionPublisherGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpSolutionPublisherGetCommand_instances, "m", _PpSolutionPublisherGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PpSolutionPublisherGetCommand_instances, "m", _PpSolutionPublisherGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PpSolutionPublisherGetCommand_instances, "m", _PpSolutionPublisherGetCommand_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) {
@@ -57,33 +67,5 @@ class PpSolutionPublisherGetCommand extends PowerPlatformCommand {
         }
     }
 }
-_PpSolutionPublisherGetCommand_instances = new WeakSet(), _PpSolutionPublisherGetCommand_initTelemetry = function _PpSolutionPublisherGetCommand_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
-        });
-    });
-}, _PpSolutionPublisherGetCommand_initOptions = function _PpSolutionPublisherGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    }, {
-        option: '--asAdmin'
-    });
-}, _PpSolutionPublisherGetCommand_initOptionSets = function _PpSolutionPublisherGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-}, _PpSolutionPublisherGetCommand_initValidators = function _PpSolutionPublisherGetCommand_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 PpSolutionPublisherGetCommand();
 //# sourceMappingURL=solution-publisher-get.js.map

package/dist/m365/pp/commands/solution/solution-publisher-list.js

@@ -1,13 +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 _PpSolutionPublisherListCommand_instances, _PpSolutionPublisherListCommand_initTelemetry, _PpSolutionPublisherListCommand_initOptions;
+import { z } from 'zod';
+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'),
+    withMicrosoftPublishers: z.boolean().optional(),
+    asAdmin: z.boolean().optional()
+});
 class PpSolutionPublisherListCommand extends PowerPlatformCommand {
     get name() {
         return commands.SOLUTION_PUBLISHER_LIST;
@@ -18,11 +20,8 @@ class PpSolutionPublisherListCommand extends PowerPlatformCommand {
     defaultProperties() {
         return ['publisherid', 'uniquename', 'friendlyname'];
     }
-    constructor() {
-        super();
-        _PpSolutionPublisherListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpSolutionPublisherListCommand_instances, "m", _PpSolutionPublisherListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpSolutionPublisherListCommand_instances, "m", _PpSolutionPublisherListCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -45,21 +44,5 @@ class PpSolutionPublisherListCommand extends PowerPlatformCommand {
         }
     }
 }
-_PpSolutionPublisherListCommand_instances = new WeakSet(), _PpSolutionPublisherListCommand_initTelemetry = function _PpSolutionPublisherListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            withMicrosoftPublishers: typeof args.options.withMicrosoftPublishers !== 'undefined',
-            asAdmin: !!args.options.asAdmin
-        });
-    });
-}, _PpSolutionPublisherListCommand_initOptions = function _PpSolutionPublisherListCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '--withMicrosoftPublishers'
-    }, {
-        option: '--asAdmin'
-    });
-};
 export default new PpSolutionPublisherListCommand();
 //# sourceMappingURL=solution-publisher-list.js.map

package/dist/m365/pp/commands/solution/solution-publisher-remove.js

@@ -1,16 +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 _PpSolutionPublisherRemoveCommand_instances, _PpSolutionPublisherRemoveCommand_initTelemetry, _PpSolutionPublisherRemoveCommand_initOptions, _PpSolutionPublisherRemoveCommand_initOptionSets, _PpSolutionPublisherRemoveCommand_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';
 import ppSolutionPublisherGetCommand from './solution-publisher-get.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(),
+    force: z.boolean().optional().alias('f')
+});
 class PpSolutionPublisherRemoveCommand extends PowerPlatformCommand {
     get name() {
         return commands.SOLUTION_PUBLISHER_REMOVE;
@@ -18,13 +24,18 @@ class PpSolutionPublisherRemoveCommand extends PowerPlatformCommand {
     get description() {
         return 'Removes a specific publisher in the specified Power Platform environment.';
     }
-    constructor() {
-        super();
-        _PpSolutionPublisherRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpSolutionPublisherRemoveCommand_instances, "m", _PpSolutionPublisherRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpSolutionPublisherRemoveCommand_instances, "m", _PpSolutionPublisherRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PpSolutionPublisherRemoveCommand_instances, "m", _PpSolutionPublisherRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PpSolutionPublisherRemoveCommand_instances, "m", _PpSolutionPublisherRemoveCommand_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) {
@@ -73,36 +84,5 @@ class PpSolutionPublisherRemoveCommand extends PowerPlatformCommand {
         }
     }
 }
-_PpSolutionPublisherRemoveCommand_instances = new WeakSet(), _PpSolutionPublisherRemoveCommand_initTelemetry = function _PpSolutionPublisherRemoveCommand_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,
-            force: !!args.options.force
-        });
-    });
-}, _PpSolutionPublisherRemoveCommand_initOptions = function _PpSolutionPublisherRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    }, {
-        option: '--asAdmin'
-    }, {
-        option: '-f, --force'
-    });
-}, _PpSolutionPublisherRemoveCommand_initOptionSets = function _PpSolutionPublisherRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-}, _PpSolutionPublisherRemoveCommand_initValidators = function _PpSolutionPublisherRemoveCommand_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 PpSolutionPublisherRemoveCommand();
 //# sourceMappingURL=solution-publisher-remove.js.map

package/dist/m365/pp/commands/solution/solution-remove.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 _PpSolutionRemoveCommand_instances, _PpSolutionRemoveCommand_initTelemetry, _PpSolutionRemoveCommand_initOptions, _PpSolutionRemoveCommand_initOptionSets, _PpSolutionRemoveCommand_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(),
+    force: z.boolean().optional().alias('f')
+});
 class PpSolutionRemoveCommand extends PowerPlatformCommand {
     get name() {
         return commands.SOLUTION_REMOVE;
@@ -17,13 +23,18 @@ class PpSolutionRemoveCommand extends PowerPlatformCommand {
     get description() {
         return 'Removes a specific solution in the specified Power Platform environment.';
     }
-    constructor() {
-        super();
-        _PpSolutionRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpSolutionRemoveCommand_instances, "m", _PpSolutionRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpSolutionRemoveCommand_instances, "m", _PpSolutionRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PpSolutionRemoveCommand_instances, "m", _PpSolutionRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PpSolutionRemoveCommand_instances, "m", _PpSolutionRemoveCommand_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) {
@@ -64,36 +75,5 @@ class PpSolutionRemoveCommand extends PowerPlatformCommand {
         }
     }
 }
-_PpSolutionRemoveCommand_instances = new WeakSet(), _PpSolutionRemoveCommand_initTelemetry = function _PpSolutionRemoveCommand_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,
-            force: !!args.options.force
-        });
-    });
-}, _PpSolutionRemoveCommand_initOptions = function _PpSolutionRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    }, {
-        option: '--asAdmin'
-    }, {
-        option: '-f, --force'
-    });
-}, _PpSolutionRemoveCommand_initOptionSets = function _PpSolutionRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-}, _PpSolutionRemoveCommand_initValidators = function _PpSolutionRemoveCommand_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 PpSolutionRemoveCommand();
 //# sourceMappingURL=solution-remove.js.map