@pnp/cli-microsoft365 12.0.0-beta.4ac11a7 → 12.0.0-beta.8769a5e

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/spo-search.js

@@ -1,16 +1,45 @@
-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 _SpoSearchCommand_instances, _SpoSearchCommand_initTelemetry, _SpoSearchCommand_initOptions, _SpoSearchCommand_initValidators;
+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 { 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,
+    queryText: z.string().alias('q'),
+    selectProperties: z.string().optional().alias('p'),
+    webUrl: z.string().optional().alias('u'),
+    allResults: z.boolean().optional(),
+    rowLimit: z.number().int().optional(),
+    sourceId: z.string().refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    }).optional(),
+    trimDuplicates: z.boolean().optional(),
+    enableStemming: z.boolean().optional(),
+    culture: z.number().int().optional(),
+    refinementFilters: z.string().optional(),
+    queryTemplate: z.string().optional(),
+    sortList: z.string().refine(val => /^([a-z0-9_]+:(ascending|descending))(,([a-z0-9_]+:(ascending|descending)))*$/i.test(val), {
+        message: `sortlist parameter value does not match the required pattern (=comma-separated list of '<property>:(ascending|descending)'-pattern)`
+    }).optional(),
+    rankingModelId: z.string().refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    }).optional(),
+    startRow: z.number().int().optional(),
+    properties: z.string().optional(),
+    sourceName: z.string().optional(),
+    refiners: z.string().optional(),
+    hiddenConstraints: z.string().optional(),
+    clientType: z.string().optional(),
+    enablePhonetic: z.boolean().optional(),
+    processBestBets: z.boolean().optional(),
+    enableQueryRules: z.boolean().optional(),
+    processPersonalFavorites: z.boolean().optional(),
+    rawOutput: z.boolean().optional()
+});
 class SpoSearchCommand extends SpoCommand {
     get name() {
         return commands.SEARCH;
@@ -18,12 +47,14 @@ class SpoSearchCommand extends SpoCommand {
     get description() {
         return 'Executes a search query';
     }
-    constructor() {
-        super();
-        _SpoSearchCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSearchCommand_instances, "m", _SpoSearchCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoSearchCommand_instances, "m", _SpoSearchCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSearchCommand_instances, "m", _SpoSearchCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => !(opts.startRow && opts.allResults), {
+            message: 'You cannot specify startRow when allResults is set'
+        });
     }
     async commandAction(logger, args) {
         let webUrl;
@@ -176,109 +207,5 @@ class SpoSearchCommand extends SpoCommand {
         return outputData;
     }
 }
-_SpoSearchCommand_instances = new WeakSet(), _SpoSearchCommand_initTelemetry = function _SpoSearchCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            selectproperties: typeof args.options.selectProperties !== 'undefined',
-            allResults: args.options.allResults,
-            rowLimit: args.options.rowLimit,
-            sourceId: typeof args.options.sourceId !== 'undefined',
-            trimDuplicates: args.options.trimDuplicates,
-            enableStemming: args.options.enableStemming,
-            culture: args.options.culture,
-            refinementFilters: typeof args.options.refinementFilters !== 'undefined',
-            queryTemplate: typeof args.options.queryTemplate !== 'undefined',
-            sortList: typeof args.options.sortList !== 'undefined',
-            rankingModelId: typeof args.options.rankingModelId !== 'undefined',
-            startRow: typeof args.options.startRow !== 'undefined',
-            properties: typeof args.options.properties !== 'undefined',
-            sourceName: typeof args.options.sourceName !== 'undefined',
-            refiners: typeof args.options.refiners !== 'undefined',
-            webUrl: typeof args.options.webUrl !== 'undefined',
-            hiddenConstraints: typeof args.options.hiddenConstraints !== 'undefined',
-            clientType: typeof args.options.clientType !== 'undefined',
-            enablePhonetic: args.options.enablePhonetic,
-            processBestBets: args.options.processBestBets,
-            enableQueryRules: args.options.enableQueryRules,
-            processPersonalFavorites: args.options.processPersonalFavorites,
-            rawOutput: args.options.rawOutput
-        });
-    });
-}, _SpoSearchCommand_initOptions = function _SpoSearchCommand_initOptions() {
-    this.options.unshift({
-        option: '-q, --queryText <queryText>'
-    }, {
-        option: '-p, --selectProperties [selectProperties]'
-    }, {
-        option: '-u, --webUrl [webUrl]'
-    }, {
-        option: '--allResults'
-    }, {
-        option: '--rowLimit [rowLimit]'
-    }, {
-        option: '--sourceId [sourceId]'
-    }, {
-        option: '--trimDuplicates'
-    }, {
-        option: '--enableStemming'
-    }, {
-        option: '--culture [culture]'
-    }, {
-        option: '--refinementFilters [refinementFilters]'
-    }, {
-        option: '--queryTemplate [queryTemplate]'
-    }, {
-        option: '--sortList [sortList]'
-    }, {
-        option: '--rankingModelId [rankingModelId]'
-    }, {
-        option: '--startRow [startRow]'
-    }, {
-        option: '--properties [properties]'
-    }, {
-        option: '--sourceName [sourceName]'
-    }, {
-        option: '--refiners [refiners]'
-    }, {
-        option: '--hiddenConstraints [hiddenConstraints]'
-    }, {
-        option: '--clientType [clientType]'
-    }, {
-        option: '--enablePhonetic'
-    }, {
-        option: '--processBestBets'
-    }, {
-        option: '--enableQueryRules'
-    }, {
-        option: '--processPersonalFavorites'
-    }, {
-        option: '--rawOutput'
-    });
-}, _SpoSearchCommand_initValidators = function _SpoSearchCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.sourceId && !validation.isValidGuid(args.options.sourceId)) {
-            return `${args.options.sourceId} is not a valid GUID`;
-        }
-        if (args.options.rankingModelId && !validation.isValidGuid(args.options.rankingModelId)) {
-            return `${args.options.rankingModelId} is not a valid GUID`;
-        }
-        if (args.options.sortList && !/^([a-z0-9_]+:(ascending|descending))(,([a-z0-9_]+:(ascending|descending)))*$/gi.test(args.options.sortList)) {
-            return `sortlist parameter value '${args.options.sortList}' does not match the required pattern (=comma-separated list of '<property>:(ascending|descending)'-pattern)`;
-        }
-        if (args.options.rowLimit && !Number.isInteger(args.options.rowLimit)) {
-            return `${args.options.rowLimit} is not a valid number`;
-        }
-        if (args.options.startRow && !Number.isInteger(args.options.startRow)) {
-            return `${args.options.startRow} is not a valid number`;
-        }
-        if (args.options.startRow && args.options.allResults) {
-            return 'You cannot specify startRow when allResults is set';
-        }
-        if (args.options.culture && !Number.isInteger(args.options.culture)) {
-            return `${args.options.culture} is not a valid number`;
-        }
-        return true;
-    });
-};
 export default new SpoSearchCommand();
 //# sourceMappingURL=spo-search.js.map