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

package/dist/m365/spo/commands/term/term-list.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 _SpoTermListCommand_instances, _SpoTermListCommand_initTelemetry, _SpoTermListCommand_initOptions, _SpoTermListCommand_initValidators, _SpoTermListCommand_initOptionSets;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -12,6 +8,15 @@ 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,
+    webUrl: z.string().optional().alias('u'),
+    termGroupId: z.string().optional(),
+    termGroupName: z.string().optional(),
+    termSetId: z.string().optional(),
+    termSetName: z.string().optional(),
+    withChildTerms: z.boolean().optional()
+});
 class SpoTermListCommand extends SpoCommand {
     get name() {
         return commands.TERM_LIST;
@@ -22,13 +27,37 @@ class SpoTermListCommand extends SpoCommand {
     defaultProperties() {
         return ['Id', 'Name', 'ParentTermId'];
     }
-    constructor() {
-        super();
-        _SpoTermListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTermListCommand_instances, "m", _SpoTermListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTermListCommand_instances, "m", _SpoTermListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTermListCommand_instances, "m", _SpoTermListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoTermListCommand_instances, "m", _SpoTermListCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => {
+            if (opts.webUrl) {
+                return validation.isValidSharePointUrl(opts.webUrl) === true;
+            }
+            return true;
+        }, { message: 'Invalid SharePoint URL' })
+            .refine(opts => {
+            if (opts.termGroupId && !validation.isValidGuid(opts.termGroupId)) {
+                return false;
+            }
+            return true;
+        }, { error: e => `${e.input.termGroupId} is not a valid GUID` })
+            .refine(opts => {
+            if (opts.termSetId && !validation.isValidGuid(opts.termSetId)) {
+                return false;
+            }
+            return true;
+        }, { error: e => `${e.input.termSetId} is not a valid GUID` })
+            .refine(opts => [opts.termGroupId, opts.termGroupName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either termGroupId or termGroupName, but not both.',
+            params: { customCode: 'optionSet', options: ['termGroupId', 'termGroupName'] }
+        })
+            .refine(opts => [opts.termSetId, opts.termSetName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either termSetId or termSetName, but not both.',
+            params: { customCode: 'optionSet', options: ['termSetId', 'termSetName'] }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -135,49 +164,5 @@ class SpoTermListCommand extends SpoCommand {
         return json[json.length - 1];
     }
 }
-_SpoTermListCommand_instances = new WeakSet(), _SpoTermListCommand_initTelemetry = function _SpoTermListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            webUrl: typeof args.options.webUrl !== 'undefined',
-            termGroupId: typeof args.options.termGroupId !== 'undefined',
-            termGroupName: typeof args.options.termGroupName !== 'undefined',
-            termSetId: typeof args.options.termSetId !== 'undefined',
-            termSetName: typeof args.options.termSetName !== 'undefined',
-            withChildTerms: !!args.options.withChildTerms
-        });
-    });
-}, _SpoTermListCommand_initOptions = function _SpoTermListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl [webUrl]'
-    }, {
-        option: '--termGroupId [termGroupId]'
-    }, {
-        option: '--termGroupName [termGroupName]'
-    }, {
-        option: '--termSetId [termSetId]'
-    }, {
-        option: '--termSetName [termSetName]'
-    }, {
-        option: '--withChildTerms'
-    });
-}, _SpoTermListCommand_initValidators = function _SpoTermListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.webUrl) {
-            const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-            if (isValidSharePointUrl !== true) {
-                return isValidSharePointUrl;
-            }
-        }
-        if (args.options.termGroupId && !validation.isValidGuid(args.options.termGroupId)) {
-            return `${args.options.termGroupId} is not a valid GUID`;
-        }
-        if (args.options.termSetId && !validation.isValidGuid(args.options.termSetId)) {
-            return `${args.options.termSetId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _SpoTermListCommand_initOptionSets = function _SpoTermListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['termGroupId', 'termGroupName'] }, { options: ['termSetId', 'termSetName'] });
-};
 export default new SpoTermListCommand();
 //# sourceMappingURL=term-list.js.map

package/dist/m365/spo/commands/term/term-set-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 _SpoTermSetAddCommand_instances, _SpoTermSetAddCommand_initTelemetry, _SpoTermSetAddCommand_initOptions, _SpoTermSetAddCommand_initValidators, _SpoTermSetAddCommand_initOptionSets;
 import { v4 } from 'uuid';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -12,6 +8,16 @@ 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,
+    name: z.string().alias('n'),
+    webUrl: z.string().optional().alias('u'),
+    termGroupId: z.string().optional(),
+    termGroupName: z.string().optional(),
+    id: z.string().optional().alias('i'),
+    description: z.string().optional().alias('d'),
+    customProperties: z.string().optional()
+});
 class SpoTermSetAddCommand extends SpoCommand {
     get name() {
         return commands.TERM_SET_ADD;
@@ -19,13 +25,44 @@ class SpoTermSetAddCommand extends SpoCommand {
     get description() {
         return 'Adds taxonomy term set';
     }
-    constructor() {
-        super();
-        _SpoTermSetAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTermSetAddCommand_instances, "m", _SpoTermSetAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTermSetAddCommand_instances, "m", _SpoTermSetAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTermSetAddCommand_instances, "m", _SpoTermSetAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoTermSetAddCommand_instances, "m", _SpoTermSetAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => {
+            if (opts.webUrl) {
+                return validation.isValidSharePointUrl(opts.webUrl) === true;
+            }
+            return true;
+        }, { message: 'Invalid SharePoint URL' })
+            .refine(opts => {
+            if (opts.id && !validation.isValidGuid(opts.id)) {
+                return false;
+            }
+            return true;
+        }, { error: e => `${e.input.id} is not a valid GUID.` })
+            .refine(opts => {
+            if (opts.termGroupId && !validation.isValidGuid(opts.termGroupId)) {
+                return false;
+            }
+            return true;
+        }, { error: e => `${e.input.termGroupId} is not a valid GUID.` })
+            .refine(opts => {
+            if (opts.customProperties) {
+                try {
+                    JSON.parse(opts.customProperties);
+                }
+                catch {
+                    return false;
+                }
+            }
+            return true;
+        }, { message: 'customProperties is not valid JSON' })
+            .refine(opts => [opts.termGroupId, opts.termGroupName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either termGroupId or termGroupName, but not both.',
+            params: { customCode: 'optionSet', options: ['termGroupId', 'termGroupName'] }
+        });
     }
     async commandAction(logger, args) {
         let termSet;
@@ -110,63 +147,5 @@ class SpoTermSetAddCommand extends SpoCommand {
         }
     }
 }
-_SpoTermSetAddCommand_instances = new WeakSet(), _SpoTermSetAddCommand_initTelemetry = function _SpoTermSetAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            webUrl: typeof args.options.webUrl !== 'undefined',
-            customProperties: typeof args.options.customProperties !== 'undefined',
-            description: typeof args.options.description !== 'undefined',
-            id: typeof args.options.id !== 'undefined',
-            termGroupId: typeof args.options.termGroupId !== 'undefined',
-            termGroupName: typeof args.options.termGroupName !== 'undefined'
-        });
-    });
-}, _SpoTermSetAddCommand_initOptions = function _SpoTermSetAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name <name>'
-    }, {
-        option: '-u, --webUrl [webUrl]'
-    }, {
-        option: '--termGroupId [termGroupId]'
-    }, {
-        option: '--termGroupName [termGroupName]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '--customProperties [customProperties]'
-    });
-}, _SpoTermSetAddCommand_initValidators = function _SpoTermSetAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.webUrl) {
-            const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-            if (isValidSharePointUrl !== true) {
-                return isValidSharePointUrl;
-            }
-        }
-        if (args.options.id) {
-            if (!validation.isValidGuid(args.options.id)) {
-                return `${args.options.id} is not a valid GUID`;
-            }
-        }
-        if (args.options.termGroupId) {
-            if (!validation.isValidGuid(args.options.termGroupId)) {
-                return `${args.options.termGroupId} is not a valid GUID`;
-            }
-        }
-        if (args.options.customProperties) {
-            try {
-                JSON.parse(args.options.customProperties);
-            }
-            catch (e) {
-                return `Error when parsing customProperties JSON: ${e}`;
-            }
-        }
-        return true;
-    });
-}, _SpoTermSetAddCommand_initOptionSets = function _SpoTermSetAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['termGroupId', 'termGroupName'] });
-};
 export default new SpoTermSetAddCommand();
 //# sourceMappingURL=term-set-add.js.map

package/dist/m365/spo/commands/term/term-set-get.js

@@ -1,9 +1,5 @@
-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 _SpoTermSetGetCommand_instances, _SpoTermSetGetCommand_initTelemetry, _SpoTermSetGetCommand_initOptions, _SpoTermSetGetCommand_initValidators, _SpoTermSetGetCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -11,6 +7,14 @@ 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,
+    webUrl: z.string().optional().alias('u'),
+    id: z.string().optional().alias('i'),
+    name: z.string().optional().alias('n'),
+    termGroupId: z.string().optional(),
+    termGroupName: z.string().optional()
+});
 class SpoTermSetGetCommand extends SpoCommand {
     get name() {
         return commands.TERM_SET_GET;
@@ -18,13 +22,37 @@ class SpoTermSetGetCommand extends SpoCommand {
     get description() {
         return 'Gets information about the specified taxonomy term set';
     }
-    constructor() {
-        super();
-        _SpoTermSetGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTermSetGetCommand_instances, "m", _SpoTermSetGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTermSetGetCommand_instances, "m", _SpoTermSetGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTermSetGetCommand_instances, "m", _SpoTermSetGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoTermSetGetCommand_instances, "m", _SpoTermSetGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => {
+            if (opts.webUrl) {
+                return validation.isValidSharePointUrl(opts.webUrl) === true;
+            }
+            return true;
+        }, { message: 'Invalid SharePoint URL' })
+            .refine(opts => {
+            if (opts.id && !validation.isValidGuid(opts.id)) {
+                return false;
+            }
+            return true;
+        }, { error: e => `${e.input.id} is not a valid GUID.` })
+            .refine(opts => {
+            if (opts.termGroupId && !validation.isValidGuid(opts.termGroupId)) {
+                return false;
+            }
+            return true;
+        }, { error: e => `${e.input.termGroupId} is not a valid GUID.` })
+            .refine(opts => [opts.id, opts.name].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either id or name, but not both.',
+            params: { customCode: 'optionSet', options: ['id', 'name'] }
+        })
+            .refine(opts => [opts.termGroupId, opts.termGroupName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either termGroupId or termGroupName, but not both.',
+            params: { customCode: 'optionSet', options: ['termGroupId', 'termGroupName'] }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -61,50 +89,5 @@ class SpoTermSetGetCommand extends SpoCommand {
         }
     }
 }
-_SpoTermSetGetCommand_instances = new WeakSet(), _SpoTermSetGetCommand_initTelemetry = function _SpoTermSetGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            webUrl: typeof args.options.webUrl !== 'undefined',
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined',
-            termGroupId: typeof args.options.termGroupId !== 'undefined',
-            termGroupName: typeof args.options.termGroupName !== 'undefined'
-        });
-    });
-}, _SpoTermSetGetCommand_initOptions = function _SpoTermSetGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl [webUrl]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    }, {
-        option: '--termGroupId [termGroupId]'
-    }, {
-        option: '--termGroupName [termGroupName]'
-    });
-}, _SpoTermSetGetCommand_initValidators = function _SpoTermSetGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.webUrl) {
-            const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-            if (isValidSharePointUrl !== true) {
-                return isValidSharePointUrl;
-            }
-        }
-        if (args.options.id) {
-            if (!validation.isValidGuid(args.options.id)) {
-                return `${args.options.id} is not a valid GUID`;
-            }
-        }
-        if (args.options.termGroupId) {
-            if (!validation.isValidGuid(args.options.termGroupId)) {
-                return `${args.options.termGroupId} is not a valid GUID`;
-            }
-        }
-        return true;
-    });
-}, _SpoTermSetGetCommand_initOptionSets = function _SpoTermSetGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] }, { options: ['termGroupId', 'termGroupName'] });
-};
 export default new SpoTermSetGetCommand();
 //# sourceMappingURL=term-set-get.js.map

package/dist/m365/spo/commands/term/term-set-list.js

@@ -1,9 +1,5 @@
-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 _SpoTermSetListCommand_instances, _SpoTermSetListCommand_initTelemetry, _SpoTermSetListCommand_initOptions, _SpoTermSetListCommand_initValidators, _SpoTermSetListCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -11,6 +7,12 @@ 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,
+    webUrl: z.string().optional().alias('u').refine(val => val === undefined || validation.isValidSharePointUrl(val) === true, { message: 'Invalid SharePoint URL' }),
+    termGroupId: z.string().optional().refine(val => val === undefined || validation.isValidGuid(val), { error: e => `${e.input} is not a valid GUID` }),
+    termGroupName: z.string().optional()
+});
 class SpoTermSetListCommand extends SpoCommand {
     get name() {
         return commands.TERM_SET_LIST;
@@ -18,13 +20,14 @@ class SpoTermSetListCommand extends SpoCommand {
     get description() {
         return 'Lists taxonomy term sets from the given term group';
     }
-    constructor() {
-        super();
-        _SpoTermSetListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTermSetListCommand_instances, "m", _SpoTermSetListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTermSetListCommand_instances, "m", _SpoTermSetListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTermSetListCommand_instances, "m", _SpoTermSetListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoTermSetListCommand_instances, "m", _SpoTermSetListCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema.refine(opts => [opts.termGroupId, opts.termGroupName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either termGroupId or termGroupName, but not both.',
+            params: { customCode: 'optionSet', options: ['termGroupId', 'termGroupName'] }
+        });
     }
     defaultProperties() {
         return ['Id', 'Name'];
@@ -51,54 +54,17 @@ class SpoTermSetListCommand extends SpoCommand {
                 throw response.ErrorInfo.ErrorMessage;
             }
             const result = json[json.length - 1];
-            if (result._Child_Items_ && result._Child_Items_.length > 0) {
-                result._Child_Items_.map(t => {
-                    t.CreatedDate = new Date(Number(t.CreatedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
-                    t.Id = t.Id.replace('/Guid(', '').replace(')/', '');
-                    t.LastModifiedDate = new Date(Number(t.LastModifiedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
-                    return t;
-                });
-                await logger.log(result._Child_Items_);
-            }
+            result._Child_Items_.forEach(t => {
+                t.CreatedDate = new Date(Number(t.CreatedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
+                t.Id = formatting.extractCsomGuid(t.Id);
+                t.LastModifiedDate = new Date(Number(t.LastModifiedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
+            });
+            await logger.log(result._Child_Items_);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
 }
-_SpoTermSetListCommand_instances = new WeakSet(), _SpoTermSetListCommand_initTelemetry = function _SpoTermSetListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            webUrl: typeof args.options.webUrl !== 'undefined',
-            termGroupId: typeof args.options.termGroupId !== 'undefined',
-            termGroupName: typeof args.options.termGroupName !== 'undefined'
-        });
-    });
-}, _SpoTermSetListCommand_initOptions = function _SpoTermSetListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl [webUrl]'
-    }, {
-        option: '--termGroupId [termGroupId]'
-    }, {
-        option: '--termGroupName [termGroupName]'
-    });
-}, _SpoTermSetListCommand_initValidators = function _SpoTermSetListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.webUrl) {
-            const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-            if (isValidSharePointUrl !== true) {
-                return isValidSharePointUrl;
-            }
-        }
-        if (args.options.termGroupId) {
-            if (!validation.isValidGuid(args.options.termGroupId)) {
-                return `${args.options.termGroupId} is not a valid GUID`;
-            }
-        }
-        return true;
-    });
-}, _SpoTermSetListCommand_initOptionSets = function _SpoTermSetListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['termGroupId', 'termGroupName'] });
-};
 export default new SpoTermSetListCommand();
 //# sourceMappingURL=term-set-list.js.map

package/dist/m365/spo/commands/theme/theme-apply.js

@@ -1,9 +1,5 @@
-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 _SpoThemeApplyCommand_instances, _SpoThemeApplyCommand_initOptions, _SpoThemeApplyCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -11,15 +7,23 @@ 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,
+    name: z.string().alias('n'),
+    webUrl: z.string().refine(val => validation.isValidSharePointUrl(val) === true, {
+        message: 'The value of the webUrl is not a valid SharePoint URL.'
+    }).alias('u'),
+    sharePointTheme: z.boolean().optional()
+});
 const SharePointThemes = {
-    Blue: "Blue",
-    Orange: "Orange",
-    Red: "Red",
-    Purple: "Purple",
-    Green: "Green",
-    Gray: "Gray",
-    "Dark Yellow": "Dark Yellow",
-    "Dark Blue": "Dark Blue"
+    Blue: 'Blue',
+    Orange: 'Orange',
+    Red: 'Red',
+    Purple: 'Purple',
+    Green: 'Green',
+    Gray: 'Gray',
+    'Dark Yellow': 'Dark Yellow',
+    'Dark Blue': 'Dark Blue'
 };
 class SpoThemeApplyCommand extends SpoCommand {
     get name() {
@@ -28,11 +32,14 @@ class SpoThemeApplyCommand extends SpoCommand {
     get description() {
         return 'Applies theme to the specified site';
     }
-    constructor() {
-        super();
-        _SpoThemeApplyCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoThemeApplyCommand_instances, "m", _SpoThemeApplyCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoThemeApplyCommand_instances, "m", _SpoThemeApplyCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => !opts.sharePointTheme || (Object.prototype.hasOwnProperty.call(SharePointThemes, opts.name)), {
+            message: 'Please check if the theme name is entered correctly.'
+        });
     }
     async commandAction(logger, args) {
         const isSharePointTheme = args.options.sharePointTheme ? true : false;
@@ -93,7 +100,7 @@ class SpoThemeApplyCommand extends SpoCommand {
         }
     }
     getSharePointTheme(themeName) {
-        let palette;
+        let palette = '';
         switch (themeName) {
             case SharePointThemes.Blue:
                 palette = "\"themePrimary\":{\"R\":0,\"G\":120,\"B\":212,\"A\":255},\"themeLighterAlt\":{\"R\":239,\"G\":246,\"B\":252,\"A\":255},\"themeLighter\":{\"R\":222,\"G\":236,\"B\":249,\"A\":255},\"themeLight\":{\"R\":199,\"G\":224,\"B\":244,\"A\":255},\"themeTertiary\":{\"R\":113,\"G\":175,\"B\":229,\"A\":255},\"themeSecondary\":{\"R\":43,\"G\":136,\"B\":216,\"A\":255},\"themeDarkAlt\":{\"R\":16,\"G\":110,\"B\":190,\"A\":255},\"themeDark\":{\"R\":0,\"G\":90,\"B\":158,\"A\":255},\"themeDarker\":{\"R\":0,\"G\":69,\"B\":120,\"A\":255},\"accent\":{\"R\":135,\"G\":100,\"B\":184,\"A\":255},\"neutralLighterAlt\":{\"R\":248,\"G\":248,\"B\":248,\"A\":255},\"neutralLighter\":{\"R\":244,\"G\":244,\"B\":244,\"A\":255},\"neutralLight\":{\"R\":234,\"G\":234,\"B\":234,\"A\":255},\"neutralQuaternaryAlt\":{\"R\":218,\"G\":218,\"B\":218,\"A\":255},\"neutralQuaternary\":{\"R\":208,\"G\":208,\"B\":208,\"A\":255},\"neutralTertiaryAlt\":{\"R\":200,\"G\":200,\"B\":200,\"A\":255},\"neutralTertiary\":{\"R\":166,\"G\":166,\"B\":166,\"A\":255},\"neutralSecondary\":{\"R\":102,\"G\":102,\"B\":102,\"A\":255},\"neutralPrimaryAlt\":{\"R\":60,\"G\":60,\"B\":60,\"A\":255},\"neutralPrimary\":{\"R\":51,\"G\":51,\"B\":51,\"A\":255},\"neutralDark\":{\"R\":33,\"G\":33,\"B\":33,\"A\":255},\"black\":{\"R\":0,\"G\":0,\"B\":0,\"A\":255},\"white\":{\"R\":255,\"G\":255,\"B\":255,\"A\":255},\"primaryBackground\":{\"R\":255,\"G\":255,\"B\":255,\"A\":255},\"primaryText\":{\"R\":51,\"G\":51,\"B\":51,\"A\":255}";
@@ -119,9 +126,6 @@ class SpoThemeApplyCommand extends SpoCommand {
             case SharePointThemes["Dark Blue"]:
                 palette = "\"themePrimary\":{\"R\":58,\"G\":150,\"B\":221,\"A\":255},\"themeLighterAlt\":{\"R\":2,\"G\":6,\"B\":9,\"A\":255},\"themeLighter\":{\"R\":9,\"G\":24,\"B\":35,\"A\":255},\"themeLight\":{\"R\":17,\"G\":45,\"B\":67,\"A\":255},\"themeTertiary\":{\"R\":35,\"G\":90,\"B\":133,\"A\":255},\"themeSecondary\":{\"R\":51,\"G\":133,\"B\":195,\"A\":255},\"themeDarkAlt\":{\"R\":75,\"G\":160,\"B\":225,\"A\":255},\"themeDark\":{\"R\":101,\"G\":174,\"B\":230,\"A\":255},\"themeDarker\":{\"R\":138,\"G\":194,\"B\":236,\"A\":255},\"accent\":{\"R\":58,\"G\":150,\"B\":221,\"A\":255},\"neutralLighterAlt\":{\"R\":29,\"G\":43,\"B\":60,\"A\":255},\"neutralLighter\":{\"R\":34,\"G\":50,\"B\":68,\"A\":255},\"neutralLight\":{\"R\":43,\"G\":61,\"B\":81,\"A\":255},\"neutralQuaternaryAlt\":{\"R\":50,\"G\":68,\"B\":89,\"A\":255},\"neutralQuaternary\":{\"R\":55,\"G\":74,\"B\":95,\"A\":255},\"neutralTertiaryAlt\":{\"R\":79,\"G\":99,\"B\":122,\"A\":255},\"neutralTertiary\":{\"R\":200,\"G\":200,\"B\":200,\"A\":255},\"neutralSecondary\":{\"R\":208,\"G\":208,\"B\":208,\"A\":255},\"neutralPrimaryAlt\":{\"R\":218,\"G\":218,\"B\":218,\"A\":255},\"neutralPrimary\":{\"R\":255,\"G\":255,\"B\":255,\"A\":255},\"neutralDark\":{\"R\":244,\"G\":244,\"B\":244,\"A\":255},\"black\":{\"R\":248,\"G\":248,\"B\":248,\"A\":255},\"white\":{\"R\":24,\"G\":37,\"B\":52,\"A\":255},\"primaryBackground\":{\"R\":24,\"G\":37,\"B\":52,\"A\":255},\"primaryText\":{\"R\":255,\"G\":255,\"B\":255,\"A\":255}";
                 break;
-            default:
-                palette = "";
-                break;
         }
         return `{
       'name': '${themeName}' ,
@@ -129,25 +133,5 @@ class SpoThemeApplyCommand extends SpoCommand {
     }`;
     }
 }
-_SpoThemeApplyCommand_instances = new WeakSet(), _SpoThemeApplyCommand_initOptions = function _SpoThemeApplyCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name <name>'
-    }, {
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--sharePointTheme'
-    });
-}, _SpoThemeApplyCommand_initValidators = function _SpoThemeApplyCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.sharePointTheme && !(args.options.name in SharePointThemes)) {
-            return 'Please check if the theme name is entered correctly.';
-        }
-        return true;
-    });
-};
 export default new SpoThemeApplyCommand();
 //# sourceMappingURL=theme-apply.js.map