@pnp/cli-microsoft365 12.0.0-beta.235caf5 → 12.0.0-beta.445fe0a

package/dist/m365/spo/commands/sitedesign/sitedesign-run-list.js

@@ -1,13 +1,14 @@
-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 _SpoSiteDesignRunListCommand_instances, _SpoSiteDesignRunListCommand_initTelemetry, _SpoSiteDesignRunListCommand_initOptions, _SpoSiteDesignRunListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.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,
+    webUrl: z.string().refine(val => validation.isValidSharePointUrl(val) === true, { message: 'The value is not a valid SharePoint Online site URL.' }).alias('u'),
+    siteDesignId: z.string().refine(val => validation.isValidGuid(val), { message: 'The value must be a valid GUID.' }).optional().alias('i')
+});
 class SpoSiteDesignRunListCommand extends SpoCommand {
     get name() {
         return commands.SITEDESIGN_RUN_LIST;
@@ -18,12 +19,8 @@ class SpoSiteDesignRunListCommand extends SpoCommand {
     defaultProperties() {
         return ['ID', 'SiteDesignID', 'SiteDesignTitle', 'StartTime'];
     }
-    constructor() {
-        super();
-        _SpoSiteDesignRunListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignRunListCommand_instances, "m", _SpoSiteDesignRunListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignRunListCommand_instances, "m", _SpoSiteDesignRunListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignRunListCommand_instances, "m", _SpoSiteDesignRunListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const data = {};
@@ -53,31 +50,5 @@ class SpoSiteDesignRunListCommand extends SpoCommand {
         }
     }
 }
-_SpoSiteDesignRunListCommand_instances = new WeakSet(), _SpoSiteDesignRunListCommand_initTelemetry = function _SpoSiteDesignRunListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            siteDesignId: typeof args.options.siteDesignId !== 'undefined'
-        });
-    });
-}, _SpoSiteDesignRunListCommand_initOptions = function _SpoSiteDesignRunListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-i, --siteDesignId [siteDesignId]'
-    });
-}, _SpoSiteDesignRunListCommand_initValidators = function _SpoSiteDesignRunListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.siteDesignId) {
-            if (!validation.isValidGuid(args.options.siteDesignId)) {
-                return `${args.options.siteDesignId} is not a valid GUID`;
-            }
-        }
-        return true;
-    });
-};
 export default new SpoSiteDesignRunListCommand();
 //# sourceMappingURL=sitedesign-run-list.js.map

package/dist/m365/spo/commands/sitedesign/sitedesign-run-status-get.js

@@ -1,13 +1,14 @@
-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 _SpoSiteDesignRunStatusGetCommand_instances, _SpoSiteDesignRunStatusGetCommand_initOptions, _SpoSiteDesignRunStatusGetCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.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,
+    webUrl: z.string().refine(val => validation.isValidSharePointUrl(val) === true, { message: 'The value is not a valid SharePoint Online site URL.' }).alias('u'),
+    runId: z.string().refine(val => validation.isValidGuid(val), { message: 'The value must be a valid GUID.' }).alias('i')
+});
 class SpoSiteDesignRunStatusGetCommand extends SpoCommand {
     get name() {
         return commands.SITEDESIGN_RUN_STATUS_GET;
@@ -15,11 +16,8 @@ class SpoSiteDesignRunStatusGetCommand extends SpoCommand {
     get description() {
         return 'Gets information about the site scripts executed for the specified site design';
     }
-    constructor() {
-        super();
-        _SpoSiteDesignRunStatusGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignRunStatusGetCommand_instances, "m", _SpoSiteDesignRunStatusGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignRunStatusGetCommand_instances, "m", _SpoSiteDesignRunStatusGetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const data = {
@@ -43,23 +41,5 @@ class SpoSiteDesignRunStatusGetCommand extends SpoCommand {
         }
     }
 }
-_SpoSiteDesignRunStatusGetCommand_instances = new WeakSet(), _SpoSiteDesignRunStatusGetCommand_initOptions = function _SpoSiteDesignRunStatusGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-i, --runId <runId>'
-    });
-}, _SpoSiteDesignRunStatusGetCommand_initValidators = function _SpoSiteDesignRunStatusGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (!validation.isValidGuid(args.options.runId)) {
-            return `${args.options.runId} is not a valid GUID`;
-        }
-        return true;
-    });
-};
 export default new SpoSiteDesignRunStatusGetCommand();
 //# sourceMappingURL=sitedesign-run-status-get.js.map

package/dist/m365/spo/commands/sitedesign/sitedesign-set.js

@@ -1,14 +1,32 @@
-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 _SpoSiteDesignSetCommand_instances, _SpoSiteDesignSetCommand_initTelemetry, _SpoSiteDesignSetCommand_initOptions, _SpoSiteDesignSetCommand_initTypes, _SpoSiteDesignSetCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.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,
+    id: z.string().refine(val => validation.isValidGuid(val), { message: 'The value must be a valid GUID.' }).alias('i'),
+    title: z.string().optional().alias('t'),
+    webTemplate: z.enum(['TeamSite', 'CommunicationSite']).optional().alias('w'),
+    siteScripts: z.string().superRefine((val, ctx) => {
+        const items = val.split(',').map(s => s.trim());
+        const invalid = items.filter(item => !validation.isValidGuid(item));
+        if (invalid.length > 0) {
+            ctx.addIssue({
+                code: 'custom',
+                message: `The following values are not valid GUIDs: ${invalid.join(', ')}`
+            });
+        }
+    }).optional().alias('s'),
+    description: z.string().optional().alias('d'),
+    previewImageUrl: z.string().optional().alias('m'),
+    previewImageAltText: z.string().optional().alias('a'),
+    thumbnailUrl: z.string().optional(),
+    version: z.string().refine(val => val.trim() !== '' && Number.isFinite(Number(val)), { message: 'Version must be a number' }).optional().alias('v'),
+    isDefault: z.boolean().optional()
+});
 class SpoSiteDesignSetCommand extends SpoCommand {
     get name() {
         return commands.SITEDESIGN_SET;
@@ -16,13 +34,8 @@ class SpoSiteDesignSetCommand extends SpoCommand {
     get description() {
         return 'Updates a site design with new values';
     }
-    constructor() {
-        super();
-        _SpoSiteDesignSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignSetCommand_instances, "m", _SpoSiteDesignSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignSetCommand_instances, "m", _SpoSiteDesignSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignSetCommand_instances, "m", _SpoSiteDesignSetCommand_initTypes).call(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignSetCommand_instances, "m", _SpoSiteDesignSetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -52,7 +65,7 @@ class SpoSiteDesignSetCommand extends SpoCommand {
                 updateInfo.WebTemplate = args.options.webTemplate === 'TeamSite' ? '64' : '68';
             }
             if (args.options.version) {
-                updateInfo.Version = args.options.version;
+                updateInfo.Version = Number(args.options.version);
             }
             if (typeof args.options.isDefault !== 'undefined') {
                 updateInfo.IsDefault = args.options.isDefault;
@@ -75,71 +88,5 @@ class SpoSiteDesignSetCommand extends SpoCommand {
         }
     }
 }
-_SpoSiteDesignSetCommand_instances = new WeakSet(), _SpoSiteDesignSetCommand_initTelemetry = function _SpoSiteDesignSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            title: typeof args.options.title !== 'undefined',
-            webTemplate: args.options.webTemplate,
-            siteScripts: typeof args.options.siteScripts !== 'undefined',
-            description: typeof args.options.description !== 'undefined',
-            previewImageUrl: typeof args.options.previewImageUrl !== 'undefined',
-            previewImageAltText: typeof args.options.previewImageAltText !== 'undefined',
-            thumbnailUrl: typeof args.options.thumbnailUrl !== 'undefined',
-            version: typeof args.options.version !== 'undefined',
-            isDefault: typeof args.options.isDefault
-        });
-    });
-}, _SpoSiteDesignSetCommand_initOptions = function _SpoSiteDesignSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '-w, --webTemplate [webTemplate]',
-        autocomplete: ['TeamSite', 'CommunicationSite']
-    }, {
-        option: '-s, --siteScripts [siteScripts]'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '-m, --previewImageUrl [previewImageUrl]'
-    }, {
-        option: '-a, --previewImageAltText [previewImageAltText]'
-    }, {
-        option: '--thumbnailUrl [thumbnailUrl]'
-    }, {
-        option: '-v, --version [version]'
-    }, {
-        option: '--isDefault [isDefault]',
-        autocomplete: ['true', 'false']
-    });
-}, _SpoSiteDesignSetCommand_initTypes = function _SpoSiteDesignSetCommand_initTypes() {
-    this.types.boolean.push('isDefault');
-}, _SpoSiteDesignSetCommand_initValidators = function _SpoSiteDesignSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (args.options.webTemplate &&
-            args.options.webTemplate !== 'TeamSite' &&
-            args.options.webTemplate !== 'CommunicationSite') {
-            return `${args.options.webTemplate} is not a valid web template type. Allowed values TeamSite|CommunicationSite`;
-        }
-        if (args.options.siteScripts) {
-            const siteScripts = args.options.siteScripts.split(',');
-            for (let i = 0; i < siteScripts.length; i++) {
-                const trimmedId = siteScripts[i].trim();
-                if (!validation.isValidGuid(trimmedId)) {
-                    return `${trimmedId} is not a valid GUID`;
-                }
-            }
-        }
-        if (args.options.version &&
-            typeof args.options.version !== 'number') {
-            return `${args.options.version} is not a number`;
-        }
-        return true;
-    });
-};
 export default new SpoSiteDesignSetCommand();
 //# sourceMappingURL=sitedesign-set.js.map

package/dist/m365/spo/commands/sitedesign/sitedesign-task-get.js

@@ -1,14 +1,14 @@
-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 _SpoSiteDesignTaskGetCommand_instances, _SpoSiteDesignTaskGetCommand_initOptions, _SpoSiteDesignTaskGetCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.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,
+    id: z.string().refine(val => validation.isValidGuid(val), { message: 'The value must be a valid GUID.' }).alias('i')
+});
 class SpoSiteDesignTaskGetCommand extends SpoCommand {
     get name() {
         return commands.SITEDESIGN_TASK_GET;
@@ -16,11 +16,8 @@ class SpoSiteDesignTaskGetCommand extends SpoCommand {
     get description() {
         return 'Gets information about the specified site design scheduled for execution';
     }
-    constructor() {
-        super();
-        _SpoSiteDesignTaskGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignTaskGetCommand_instances, "m", _SpoSiteDesignTaskGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignTaskGetCommand_instances, "m", _SpoSiteDesignTaskGetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -45,17 +42,5 @@ class SpoSiteDesignTaskGetCommand extends SpoCommand {
         }
     }
 }
-_SpoSiteDesignTaskGetCommand_instances = new WeakSet(), _SpoSiteDesignTaskGetCommand_initOptions = function _SpoSiteDesignTaskGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    });
-}, _SpoSiteDesignTaskGetCommand_initValidators = function _SpoSiteDesignTaskGetCommand_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 SpoSiteDesignTaskGetCommand();
 //# sourceMappingURL=sitedesign-task-get.js.map

package/dist/m365/spo/commands/sitedesign/sitedesign-task-list.js

@@ -1,13 +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 _SpoSiteDesignTaskListCommand_instances, _SpoSiteDesignTaskListCommand_initOptions, _SpoSiteDesignTaskListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.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,
+    webUrl: z.string().refine(val => validation.isValidSharePointUrl(val) === true, { message: 'The value is not a valid SharePoint Online site URL.' }).alias('u')
+});
 class SpoSiteDesignTaskListCommand extends SpoCommand {
     get name() {
         return commands.SITEDESIGN_TASK_LIST;
@@ -18,11 +18,8 @@ class SpoSiteDesignTaskListCommand extends SpoCommand {
     defaultProperties() {
         return ['ID', 'SiteDesignID', 'LogonName'];
     }
-    constructor() {
-        super();
-        _SpoSiteDesignTaskListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignTaskListCommand_instances, "m", _SpoSiteDesignTaskListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignTaskListCommand_instances, "m", _SpoSiteDesignTaskListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const requestOptions = {
@@ -41,12 +38,5 @@ class SpoSiteDesignTaskListCommand extends SpoCommand {
         }
     }
 }
-_SpoSiteDesignTaskListCommand_instances = new WeakSet(), _SpoSiteDesignTaskListCommand_initOptions = function _SpoSiteDesignTaskListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    });
-}, _SpoSiteDesignTaskListCommand_initValidators = function _SpoSiteDesignTaskListCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
-};
 export default new SpoSiteDesignTaskListCommand();
 //# sourceMappingURL=sitedesign-task-list.js.map

package/dist/m365/spo/commands/sitedesign/sitedesign-task-remove.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 _SpoSiteDesignTaskRemoveCommand_instances, _SpoSiteDesignTaskRemoveCommand_initTelemetry, _SpoSiteDesignTaskRemoveCommand_initOptions, _SpoSiteDesignTaskRemoveCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.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,
+    id: z.string().refine(val => validation.isValidGuid(val), { message: 'The value must be a valid GUID.' }).alias('i'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoSiteDesignTaskRemoveCommand extends SpoCommand {
     get name() {
         return commands.SITEDESIGN_TASK_REMOVE;
@@ -17,12 +18,8 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes the specified site design scheduled for execution';
     }
-    constructor() {
-        super();
-        _SpoSiteDesignTaskRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignTaskRemoveCommand_instances, "m", _SpoSiteDesignTaskRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignTaskRemoveCommand_instances, "m", _SpoSiteDesignTaskRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignTaskRemoveCommand_instances, "m", _SpoSiteDesignTaskRemoveCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -55,25 +52,5 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoSiteDesignTaskRemoveCommand_instances = new WeakSet(), _SpoSiteDesignTaskRemoveCommand_initTelemetry = function _SpoSiteDesignTaskRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: args.options.force || false
-        });
-    });
-}, _SpoSiteDesignTaskRemoveCommand_initOptions = function _SpoSiteDesignTaskRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoSiteDesignTaskRemoveCommand_initValidators = function _SpoSiteDesignTaskRemoveCommand_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 SpoSiteDesignTaskRemoveCommand();
 //# sourceMappingURL=sitedesign-task-remove.js.map

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

@@ -1,11 +1,6 @@
-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 _SpoTenantAppCatalogAddCommand_instances, _SpoTenantAppCatalogAddCommand_initTelemetry, _SpoTenantAppCatalogAddCommand_initOptions, _SpoTenantAppCatalogAddCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
-import { CommandError } from '../../../../Command.js';
+import { CommandError, globalOptionsZod } from '../../../../Command.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
@@ -13,6 +8,15 @@ import spoSiteAddCommand from '../site/site-add.js';
 import spoSiteGetCommand from '../site/site-get.js';
 import spoSiteRemoveCommand from '../site/site-remove.js';
 import spoTenantAppCatalogUrlGetCommand from './tenant-appcatalogurl-get.js';
+const isNonEmptyFiniteNumber = (value) => value.trim().length > 0 && Number.isFinite(Number(value));
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    url: z.string().refine(val => validation.isValidSharePointUrl(val) === true, { message: 'The value is not a valid SharePoint site URL.' }).alias('u'),
+    owner: z.string(),
+    timeZone: z.string().refine(val => isNonEmptyFiniteNumber(val), { message: 'timeZone is not a number' }).alias('z'),
+    wait: z.boolean().optional(),
+    force: z.boolean().optional()
+});
 class SpoTenantAppCatalogAddCommand extends SpoCommand {
     get name() {
         return commands.TENANT_APPCATALOG_ADD;
@@ -20,12 +24,8 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand {
     get description() {
         return 'Creates new tenant app catalog site';
     }
-    constructor() {
-        super();
-        _SpoTenantAppCatalogAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTenantAppCatalogAddCommand_instances, "m", _SpoTenantAppCatalogAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTenantAppCatalogAddCommand_instances, "m", _SpoTenantAppCatalogAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTenantAppCatalogAddCommand_instances, "m", _SpoTenantAppCatalogAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -43,9 +43,9 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand {
                 await logger.logToStderr(`Found app catalog URL ${appCatalogUrl}`);
             }
             //Using JSON.parse
-            await this.ensureNoExistingSite(appCatalogUrl, args.options.force, logger);
+            await this.ensureNoExistingSite(appCatalogUrl, args.options.force ?? false, logger);
         }
-        await this.ensureNoExistingSite(args.options.url, args.options.force, logger);
+        await this.ensureNoExistingSite(args.options.url, args.options.force ?? false, logger);
         await this.createAppCatalog(args.options, logger);
     }
     async ensureNoExistingSite(url, force, logger) {
@@ -110,36 +110,5 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand {
         return cli.executeCommand(spoSiteAddCommand, { options: { ...siteAddOptions, _: [] } });
     }
 }
-_SpoTenantAppCatalogAddCommand_instances = new WeakSet(), _SpoTenantAppCatalogAddCommand_initTelemetry = function _SpoTenantAppCatalogAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            wait: args.options.wait || false,
-            force: args.options.force || false
-        });
-    });
-}, _SpoTenantAppCatalogAddCommand_initOptions = function _SpoTenantAppCatalogAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --url <url>'
-    }, {
-        option: '--owner <owner>'
-    }, {
-        option: '-z, --timeZone <timeZone>'
-    }, {
-        option: '--wait'
-    }, {
-        option: '--force'
-    });
-}, _SpoTenantAppCatalogAddCommand_initValidators = function _SpoTenantAppCatalogAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.url);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (typeof args.options.timeZone !== 'number') {
-            return `${args.options.timeZone} is not a number`;
-        }
-        return true;
-    });
-};
 export default new SpoTenantAppCatalogAddCommand();
 //# sourceMappingURL=tenant-appcatalog-add.js.map

package/dist/m365/spo/commands/tenant/tenant-appcatalogurl-get.js

@@ -1,7 +1,9 @@
+import { globalOptionsZod } from '../../../../Command.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 SpoTenantAppCatalogUrlGetCommand extends SpoCommand {
     get name() {
         return commands.TENANT_APPCATALOGURL_GET;
@@ -9,6 +11,9 @@ class SpoTenantAppCatalogUrlGetCommand extends SpoCommand {
     get description() {
         return 'Gets the URL of the tenant app catalog';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         try {
             const spoUrl = await spo.getSpoUrl(logger, this.debug);

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

@@ -1,10 +1,6 @@
-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 _SpoTenantApplicationCustomizerAddCommand_instances, _SpoTenantApplicationCustomizerAddCommand_initTelemetry, _SpoTenantApplicationCustomizerAddCommand_initOptions, _SpoTenantApplicationCustomizerAddCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -12,6 +8,14 @@ import commands from '../../commands.js';
 import spoListItemAddCommand from '../listitem/listitem-add.js';
 import spoListItemListCommand from '../listitem/listitem-list.js';
 import spoTenantAppCatalogUrlGetCommand from '../tenant/tenant-appcatalogurl-get.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    title: z.string().alias('t'),
+    clientSideComponentId: z.string().refine(val => validation.isValidGuid(val), { message: 'clientSideComponentId is not a valid GUID' }).alias('i'),
+    clientSideComponentProperties: z.string().refine(validation.isValidJsonOrEmpty, { message: 'clientSideComponentProperties is not a valid JSON string' }).optional().alias('p'),
+    hostProperties: z.string().refine(validation.isValidJsonOrEmpty, { message: 'hostProperties is not a valid JSON string' }).optional(),
+    webTemplate: z.string().optional().alias('w')
+});
 class SpoTenantApplicationCustomizerAddCommand extends SpoCommand {
     get name() {
         return commands.TENANT_APPLICATIONCUSTOMIZER_ADD;
@@ -19,12 +23,8 @@ class SpoTenantApplicationCustomizerAddCommand extends SpoCommand {
     get description() {
         return 'Adds an application customizer as a tenant wide extension.';
     }
-    constructor() {
-        super();
-        _SpoTenantApplicationCustomizerAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTenantApplicationCustomizerAddCommand_instances, "m", _SpoTenantApplicationCustomizerAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTenantApplicationCustomizerAddCommand_instances, "m", _SpoTenantApplicationCustomizerAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTenantApplicationCustomizerAddCommand_instances, "m", _SpoTenantApplicationCustomizerAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -137,49 +137,5 @@ class SpoTenantApplicationCustomizerAddCommand extends SpoCommand {
         await cli.executeCommand(spoListItemAddCommand, { options: { ...commandOptions, _: [] } });
     }
 }
-_SpoTenantApplicationCustomizerAddCommand_instances = new WeakSet(), _SpoTenantApplicationCustomizerAddCommand_initTelemetry = function _SpoTenantApplicationCustomizerAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            clientSideComponentProperties: typeof args.options.clientSideComponentProperties !== 'undefined',
-            hostProperties: typeof args.options.hostProperties !== 'undefined',
-            webTemplate: typeof args.options.webTemplate !== 'undefined'
-        });
-    });
-}, _SpoTenantApplicationCustomizerAddCommand_initOptions = function _SpoTenantApplicationCustomizerAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --title <title>'
-    }, {
-        option: '-i, --clientSideComponentId <clientSideComponentId>'
-    }, {
-        option: '-p, --clientSideComponentProperties [clientSideComponentProperties]'
-    }, {
-        option: '--hostProperties [hostProperties]'
-    }, {
-        option: '-w, --webTemplate [webTemplate]'
-    });
-}, _SpoTenantApplicationCustomizerAddCommand_initValidators = function _SpoTenantApplicationCustomizerAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.clientSideComponentId)) {
-            return `${args.options.clientSideComponentId} is not a valid GUID`;
-        }
-        if (args.options.clientSideComponentProperties) {
-            try {
-                JSON.parse(args.options.clientSideComponentProperties);
-            }
-            catch (e) {
-                return `An error has occurred while parsing clientSideComponentProperties: ${e}`;
-            }
-        }
-        if (args.options.hostProperties) {
-            try {
-                JSON.parse(args.options.hostProperties);
-            }
-            catch (e) {
-                return `An error has occurred while parsing hostProperties: ${e}`;
-            }
-        }
-        return true;
-    });
-};
 export default new SpoTenantApplicationCustomizerAddCommand();
 //# sourceMappingURL=tenant-applicationcustomizer-add.js.map