@pnp/cli-microsoft365 11.12.0-beta.8589b73 → 12.0.0-beta.8dff3ac

package/dist/m365/spo/commands/cdn/cdn-origin-list.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 _SpoCdnOriginListCommand_instances, _SpoCdnOriginListCommand_initTelemetry, _SpoCdnOriginListCommand_initOptions, _SpoCdnOriginListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.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 = z.strictObject({
+    ...globalOptionsZod.shape,
+    type: z.enum(['Public', 'Private']).optional().alias('t')
+});
 class SpoCdnOriginListCommand extends SpoCommand {
     get name() {
         return commands.CDN_ORIGIN_LIST;
@@ -16,12 +16,8 @@ class SpoCdnOriginListCommand extends SpoCommand {
     get description() {
         return 'Lists CDN origins settings for the current SharePoint Online tenant';
     }
-    constructor() {
-        super();
-        _SpoCdnOriginListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCdnOriginListCommand_instances, "m", _SpoCdnOriginListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCdnOriginListCommand_instances, "m", _SpoCdnOriginListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCdnOriginListCommand_instances, "m", _SpoCdnOriginListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const cdnTypeString = args.options.type || 'Public';
@@ -56,27 +52,5 @@ class SpoCdnOriginListCommand extends SpoCommand {
         }
     }
 }
-_SpoCdnOriginListCommand_instances = new WeakSet(), _SpoCdnOriginListCommand_initTelemetry = function _SpoCdnOriginListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            cdnType: args.options.type || 'Public'
-        });
-    });
-}, _SpoCdnOriginListCommand_initOptions = function _SpoCdnOriginListCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --type [type]',
-        autocomplete: ['Public', 'Private']
-    });
-}, _SpoCdnOriginListCommand_initValidators = function _SpoCdnOriginListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.type) {
-            if (args.options.type !== 'Public' &&
-                args.options.type !== 'Private') {
-                return `${args.options.type} is not a valid CDN type. Allowed values are Public|Private`;
-            }
-        }
-        return true;
-    });
-};
 export default new SpoCdnOriginListCommand();
 //# sourceMappingURL=cdn-origin-list.js.map

package/dist/m365/spo/commands/cdn/cdn-origin-remove.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 _SpoCdnOriginRemoveCommand_instances, _SpoCdnOriginRemoveCommand_initTelemetry, _SpoCdnOriginRemoveCommand_initOptions, _SpoCdnOriginRemoveCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
@@ -11,6 +7,12 @@ import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    type: z.enum(['Public', 'Private']).optional().alias('t'),
+    origin: z.string().alias('r'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoCdnOriginRemoveCommand extends SpoCommand {
     get name() {
         return commands.CDN_ORIGIN_REMOVE;
@@ -18,12 +20,8 @@ class SpoCdnOriginRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes CDN origin for the current SharePoint Online tenant';
     }
-    constructor() {
-        super();
-        _SpoCdnOriginRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCdnOriginRemoveCommand_instances, "m", _SpoCdnOriginRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCdnOriginRemoveCommand_instances, "m", _SpoCdnOriginRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCdnOriginRemoveCommand_instances, "m", _SpoCdnOriginRemoveCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const cdnTypeString = args.options.type || 'Public';
@@ -68,32 +66,5 @@ class SpoCdnOriginRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoCdnOriginRemoveCommand_instances = new WeakSet(), _SpoCdnOriginRemoveCommand_initTelemetry = function _SpoCdnOriginRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            cdnType: args.options.type || 'Public',
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _SpoCdnOriginRemoveCommand_initOptions = function _SpoCdnOriginRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --type [type]',
-        autocomplete: ['Public', 'Private']
-    }, {
-        option: '-r, --origin <origin>'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoCdnOriginRemoveCommand_initValidators = function _SpoCdnOriginRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.type) {
-            if (args.options.type !== 'Public' &&
-                args.options.type !== 'Private') {
-                return `${args.options.type} is not a valid CDN type. Allowed values are Public|Private`;
-            }
-        }
-        return true;
-    });
-};
 export default new SpoCdnOriginRemoveCommand();
 //# sourceMappingURL=cdn-origin-remove.js.map

package/dist/m365/spo/commands/cdn/cdn-policy-list.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 _SpoCdnPolicyListCommand_instances, _SpoCdnPolicyListCommand_initTelemetry, _SpoCdnPolicyListCommand_initOptions, _SpoCdnPolicyListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.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 = z.strictObject({
+    ...globalOptionsZod.shape,
+    cdnType: z.enum(['Public', 'Private']).optional().alias('t')
+});
 class SpoCdnPolicyListCommand extends SpoCommand {
     get name() {
         return commands.CDN_POLICY_LIST;
@@ -16,12 +16,8 @@ class SpoCdnPolicyListCommand extends SpoCommand {
     get description() {
         return 'Lists CDN policies settings for the current SharePoint Online tenant';
     }
-    constructor() {
-        super();
-        _SpoCdnPolicyListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCdnPolicyListCommand_instances, "m", _SpoCdnPolicyListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCdnPolicyListCommand_instances, "m", _SpoCdnPolicyListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCdnPolicyListCommand_instances, "m", _SpoCdnPolicyListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const cdnTypeString = args.options.cdnType || 'Public';
@@ -65,27 +61,5 @@ class SpoCdnPolicyListCommand extends SpoCommand {
         }
     }
 }
-_SpoCdnPolicyListCommand_instances = new WeakSet(), _SpoCdnPolicyListCommand_initTelemetry = function _SpoCdnPolicyListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            cdnType: args.options.cdnType || 'Public'
-        });
-    });
-}, _SpoCdnPolicyListCommand_initOptions = function _SpoCdnPolicyListCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --cdnType [cdnType]',
-        autocomplete: ['Public', 'Private']
-    });
-}, _SpoCdnPolicyListCommand_initValidators = function _SpoCdnPolicyListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.cdnType) {
-            if (args.options.cdnType !== 'Public' &&
-                args.options.cdnType !== 'Private') {
-                return `${args.options.cdnType} is not a valid CDN type. Allowed values are Public|Private`;
-            }
-        }
-        return true;
-    });
-};
 export default new SpoCdnPolicyListCommand();
 //# sourceMappingURL=cdn-policy-list.js.map

package/dist/m365/spo/commands/cdn/cdn-policy-set.js

@@ -1,15 +1,17 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SpoCdnPolicySetCommand_instances, _SpoCdnPolicySetCommand_initTelemetry, _SpoCdnPolicySetCommand_initOptions, _SpoCdnPolicySetCommand_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';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    cdnType: z.enum(['Public', 'Private']).optional().alias('t'),
+    policy: z.enum(['IncludeFileExtensions', 'ExcludeRestrictedSiteClassifications']).alias('p'),
+    value: z.string().alias('v')
+});
 class SpoCdnPolicySetCommand extends SpoCommand {
     get name() {
         return commands.CDN_POLICY_SET;
@@ -17,12 +19,8 @@ class SpoCdnPolicySetCommand extends SpoCommand {
     get description() {
         return 'Sets CDN policy value for the current SharePoint Online tenant';
     }
-    constructor() {
-        super();
-        _SpoCdnPolicySetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCdnPolicySetCommand_instances, "m", _SpoCdnPolicySetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCdnPolicySetCommand_instances, "m", _SpoCdnPolicySetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCdnPolicySetCommand_instances, "m", _SpoCdnPolicySetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const cdnTypeString = args.options.cdnType || 'Public';
@@ -62,38 +60,5 @@ class SpoCdnPolicySetCommand extends SpoCommand {
         }
     }
 }
-_SpoCdnPolicySetCommand_instances = new WeakSet(), _SpoCdnPolicySetCommand_initTelemetry = function _SpoCdnPolicySetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            cdnType: args.options.cdnType || 'Public',
-            policy: args.options.policy
-        });
-    });
-}, _SpoCdnPolicySetCommand_initOptions = function _SpoCdnPolicySetCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --cdnType [cdnType]',
-        autocomplete: ['Public', 'Private']
-    }, {
-        option: '-p, --policy <policy>',
-        autocomplete: ['IncludeFileExtensions', 'ExcludeRestrictedSiteClassifications']
-    }, {
-        option: '-v, --value <value>'
-    });
-}, _SpoCdnPolicySetCommand_initValidators = function _SpoCdnPolicySetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.cdnType) {
-            if (args.options.cdnType !== 'Public' &&
-                args.options.cdnType !== 'Private') {
-                return `${args.options.cdnType} is not a valid CDN type. Allowed values are Public|Private`;
-            }
-        }
-        if (!args.options.policy ||
-            (args.options.policy !== 'IncludeFileExtensions' &&
-                args.options.policy !== 'ExcludeRestrictedSiteClassifications')) {
-            return `${args.options.policy} is not a valid CDN policy. Allowed values are IncludeFileExtensions|ExcludeRestrictedSiteClassifications`;
-        }
-        return true;
-    });
-};
 export default new SpoCdnPolicySetCommand();
 //# sourceMappingURL=cdn-policy-set.js.map

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

@@ -1,14 +1,16 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SpoCdnSetCommand_instances, _SpoCdnSetCommand_initTelemetry, _SpoCdnSetCommand_initOptions, _SpoCdnSetCommand_initTypes, _SpoCdnSetCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.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 = z.strictObject({
+    ...globalOptionsZod.shape,
+    type: z.enum(['Public', 'Private', 'Both']).optional().alias('t'),
+    enabled: z.boolean().alias('e'),
+    noDefaultOrigins: z.boolean().optional()
+});
 class SpoCdnSetCommand extends SpoCommand {
     get name() {
         return commands.CDN_SET;
@@ -16,14 +18,8 @@ class SpoCdnSetCommand extends SpoCommand {
     get description() {
         return 'Enables or disables the specified Microsoft 365 CDN';
     }
-    constructor() {
-        super();
-        _SpoCdnSetCommand_instances.add(this);
-        this.validTypes = ['Public', 'Private', 'Both'];
-        __classPrivateFieldGet(this, _SpoCdnSetCommand_instances, "m", _SpoCdnSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCdnSetCommand_instances, "m", _SpoCdnSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCdnSetCommand_instances, "m", _SpoCdnSetCommand_initTypes).call(this);
-        __classPrivateFieldGet(this, _SpoCdnSetCommand_instances, "m", _SpoCdnSetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const cdnTypeString = args.options.type || 'Public';
@@ -99,37 +95,5 @@ class SpoCdnSetCommand extends SpoCommand {
         }
     }
 }
-_SpoCdnSetCommand_instances = new WeakSet(), _SpoCdnSetCommand_initTelemetry = function _SpoCdnSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            cdnType: args.options.type || 'Public',
-            enabled: args.options.enabled,
-            noDefaultOrigins: !!args.options.noDefaultOrigins
-        });
-    });
-}, _SpoCdnSetCommand_initOptions = function _SpoCdnSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --enabled <enabled>',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '-t, --type [type]',
-        autocomplete: this.validTypes
-    }, {
-        option: '--noDefaultOrigins'
-    });
-}, _SpoCdnSetCommand_initTypes = function _SpoCdnSetCommand_initTypes() {
-    this.types.boolean.push('enabled', 'noDefaultOrigins');
-    this.types.string.push('type');
-}, _SpoCdnSetCommand_initValidators = function _SpoCdnSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.type) {
-            if (args.options.type !== 'Public' && args.options.type !== 'Both' &&
-                args.options.type !== 'Private') {
-                return `${args.options.type} is not a valid CDN type. Allowed values are ${this.validTypes.join(', ')}.`;
-            }
-        }
-        return true;
-    });
-};
 export default new SpoCdnSetCommand();
 //# sourceMappingURL=cdn-set.js.map

package/dist/m365/spo/commands/contenttype/contenttype-sync.js

@@ -9,7 +9,6 @@ import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import { urlUtil } from '../../../../utils/urlUtil.js';
 import { odata } from '../../../../utils/odata.js';
 import { spo } from '../../../../utils/spo.js';
 class SpoContentTypeSyncCommand extends SpoCommand {
@@ -31,11 +30,16 @@ class SpoContentTypeSyncCommand extends SpoCommand {
     async commandAction(logger, args) {
         const { listId, listTitle, listUrl, webUrl } = args.options;
         const url = new URL(webUrl);
-        const baseUrl = 'https://graph.microsoft.com/v1.0/sites/';
+        const baseUrl = `${url.origin}/_api/v2.0/sites/`;
         try {
-            const siteUrl = url.pathname === '/' ? url.host : await spo.getSiteIdByMSGraph(webUrl, logger, this.verbose);
-            const listPath = listId || listTitle || listUrl ? `/lists/${listId || listTitle || await this.getListIdByUrl(webUrl, listUrl, logger)}` : '';
-            const contentTypeId = await this.getContentTypeId(baseUrl, url, args.options, logger);
+            const [siteId, webId] = await Promise.all([
+                spo.getSiteIdBySPApi(webUrl, logger, this.verbose),
+                spo.getWebId(webUrl, logger, this.verbose)
+            ]);
+            const siteUrl = `${url.host},${siteId},${webId}`;
+            const targetListId = listId || (listTitle || listUrl ? await spo.getListId(webUrl, listTitle, listUrl, logger, this.verbose) : undefined);
+            const listPath = targetListId ? `/lists/${targetListId}` : '';
+            const contentTypeId = await this.getContentTypeId(webUrl, args.options, logger);
             if (this.verbose) {
                 await logger.logToStderr(`Adding or syncing the content type...`);
             }
@@ -60,34 +64,18 @@ class SpoContentTypeSyncCommand extends SpoCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getContentTypeId(baseUrl, url, options, logger) {
+    async getContentTypeId(webUrl, options, logger) {
         if (options.id) {
             return options.id;
         }
-        const siteId = await spo.getSiteIdByMSGraph(`${url.origin}/sites/contenttypehub`, logger, this.verbose);
         if (this.verbose) {
             await logger.logToStderr(`Retrieving content type Id by name...`);
         }
-        const contentTypes = await odata.getAllItems(`${baseUrl}${siteId}/contenttypes?$filter=name eq '${options.name}'&$select=id,name`);
+        const contentTypes = await odata.getAllItems(`${webUrl}/_api/web/AvailableContentTypes?$filter=Name eq '${formatting.encodeQueryParameter(options.name)}'&$select=StringId,Name`);
         if (contentTypes.length === 0) {
             throw `Content type with name ${options.name} not found.`;
         }
-        return contentTypes[0].id;
-    }
-    async getListIdByUrl(webUrl, listUrl, logger) {
-        if (this.verbose) {
-            await logger.logToStderr(`Retrieving list id to sync the content type to...`);
-        }
-        const listServerRelativeUrl = urlUtil.getServerRelativePath(webUrl, listUrl);
-        const requestOptions = {
-            url: `${webUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')?$select=id`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        const response = await request.get(requestOptions);
-        return response.Id;
+        return contentTypes[0].StringId;
     }
 }
 _SpoContentTypeSyncCommand_instances = new WeakSet(), _SpoContentTypeSyncCommand_initTelemetry = function _SpoContentTypeSyncCommand_initTelemetry() {

package/dist/m365/spo/commands/file/file-add.js

@@ -45,11 +45,8 @@ class SpoFileAddCommand extends SpoCommand {
             await logger.logToStderr(`file name: ${fileName}...`);
             await logger.logToStderr(`folder path: ${folderPath}...`);
         }
-        if (args.options.overwrite === undefined) {
-            await this.warn(logger, 'In the next major version, the --overwrite option will default to false. To avoid this warning, please set the --overwrite option explicitly to true or false.');
-        }
         try {
-            if (args.options.overwrite === false) {
+            if (!args.options.overwrite) {
                 try {
                     const requestOptions = {
                         url: `${args.options.webUrl}/_api/Web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath + '/' + fileName)}')?$select=Exists`,
@@ -491,8 +488,7 @@ _SpoFileAddCommand_instances = new WeakSet(), _SpoFileAddCommand_initTelemetry =
     }, {
         option: '--publishComment [publishComment]'
     }, {
-        option: '--overwrite [overwrite]',
-        autocomplete: ['true', 'false']
+        option: '--overwrite'
     }, {
         option: '--fileName [fileName]'
     });

package/dist/m365/spo/commands/file/file-archive.js

@@ -40,7 +40,7 @@ class SpoFileArchiveCommand extends SpoCommand {
     async commandAction(logger, args) {
         const { webUrl, url, id, force, verbose } = args.options;
         if (!force) {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you would like to archive this item? You will be able to reactivate it instantly for the first 7 days. After that, it will take up to 24 hours to reactivate.` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you would like to archive this file? You will be able to reactivate it instantly for the first 7 days. After that, it will take up to 24 hours to reactivate.` });
             if (!result) {
                 return;
             }

package/dist/m365/spo/commands/file/file-remove.js

@@ -46,7 +46,7 @@ class SpoFileRemoveCommand extends SpoCommand {
                 const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
                 requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')`;
             }
-            if (args.options.recycle) {
+            if (!args.options.permanent) {
                 requestUrl += `/recycle()`;
             }
             const requestOptions = {
@@ -73,7 +73,7 @@ class SpoFileRemoveCommand extends SpoCommand {
             await removeFile();
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to ${args.options.recycle ? 'recycle' : 'remove'} the file ${args.options.id || args.options.url} located in site ${args.options.webUrl}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to ${args.options.permanent ? 'permanently remove' : 'recycle'} the file ${args.options.id || args.options.url} located in site ${args.options.webUrl}?` });
             if (result) {
                 await removeFile();
             }
@@ -85,7 +85,7 @@ _SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelem
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
             url: typeof args.options.url !== 'undefined',
-            recycle: !!args.options.recycle,
+            permanent: !!args.options.permanent,
             bypassSharedLock: !!args.options.bypassSharedLock,
             force: !!args.options.force
         });
@@ -98,7 +98,7 @@ _SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelem
     }, {
         option: '--url [url]'
     }, {
-        option: '--recycle'
+        option: '--permanent'
     }, {
         option: '--bypassSharedLock'
     }, {
@@ -120,7 +120,7 @@ _SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelem
     this.optionSets.push({ options: ['id', 'url'] });
 }, _SpoFileRemoveCommand_initTypes = function _SpoFileRemoveCommand_initTypes() {
     this.types.string.push('webUrl', 'id', 'url');
-    this.types.boolean.push('recycle', 'bypassSharedLock', 'force');
+    this.types.boolean.push('permanent', 'bypassSharedLock', 'force');
 };
 export default new SpoFileRemoveCommand();
 //# sourceMappingURL=file-remove.js.map

package/dist/m365/spo/commands/file/file-unarchive.js

@@ -40,7 +40,7 @@ class SpoFileUnarchiveCommand extends SpoCommand {
     async commandAction(logger, args) {
         const { webUrl, url, id, force, verbose } = args.options;
         if (!force) {
-            const result = await cli.promptForConfirmation({ message: `Reactivation could take up to 24 hours. Files that are reactivated cannot be archived again for 30 days. Are you sure you would like to unarchive this item?` });
+            const result = await cli.promptForConfirmation({ message: `Reactivation could take up to 24 hours. Files that are reactivated cannot be archived again for a period of time. Are you sure you would like to unarchive this file?` });
             if (!result) {
                 return;
             }

package/dist/m365/spo/commands/folder/folder-archive.js

@@ -40,7 +40,7 @@ class SpoFolderArchiveCommand extends SpoCommand {
     async commandAction(logger, args) {
         const { webUrl, url, id, force } = args.options;
         if (!force) {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you would like to archive this item? You will be able to reactivate it instantly for the first 7 days. After that, it will take up to 24 hours to reactivate.` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you would like to archive this folder? You will be able to reactivate it instantly for the first 7 days. After that, it will take up to 24 hours to reactivate.` });
             if (!result) {
                 return;
             }

package/dist/m365/spo/commands/folder/folder-remove.js

@@ -34,7 +34,7 @@ class SpoFolderRemoveCommand extends SpoCommand {
             await this.removeFolder(logger, args.options);
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the folder ${args.options.url} located in site ${args.options.webUrl}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to ${args.options.permanent ? 'permanently remove' : 'recycle'} the folder ${args.options.url} located in site ${args.options.webUrl}?` });
             if (result) {
                 await this.removeFolder(logger, args.options);
             }
@@ -46,7 +46,7 @@ class SpoFolderRemoveCommand extends SpoCommand {
         }
         const serverRelativePath = urlUtil.getServerRelativePath(options.webUrl, options.url);
         let requestUrl = `${options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')`;
-        if (options.recycle) {
+        if (!options.permanent) {
             requestUrl += `/recycle()`;
         }
         const requestOptions = {
@@ -70,7 +70,7 @@ class SpoFolderRemoveCommand extends SpoCommand {
 _SpoFolderRemoveCommand_instances = new WeakSet(), _SpoFolderRemoveCommand_initTelemetry = function _SpoFolderRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            recycle: !!args.options.recycle,
+            permanent: !!args.options.permanent,
             force: !!args.options.force
         });
     });
@@ -80,7 +80,7 @@ _SpoFolderRemoveCommand_instances = new WeakSet(), _SpoFolderRemoveCommand_initT
     }, {
         option: '--url <url>'
     }, {
-        option: '--recycle'
+        option: '--permanent'
     }, {
         option: '-f, --force'
     });
@@ -88,7 +88,7 @@ _SpoFolderRemoveCommand_instances = new WeakSet(), _SpoFolderRemoveCommand_initT
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
 }, _SpoFolderRemoveCommand_initTypes = function _SpoFolderRemoveCommand_initTypes() {
     this.types.string.push('webUrl', 'url');
-    this.types.boolean.push('recycle', 'force');
+    this.types.boolean.push('permanent', 'force');
 };
 export default new SpoFolderRemoveCommand();
 //# sourceMappingURL=folder-remove.js.map

package/dist/m365/spo/commands/hidedefaultthemes/hidedefaultthemes-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 SpoHideDefaultThemesGetCommand extends SpoCommand {
     get name() {
         return commands.HIDEDEFAULTTHEMES_GET;
@@ -9,6 +11,9 @@ class SpoHideDefaultThemesGetCommand extends SpoCommand {
     get description() {
         return 'Gets the current value of the HideDefaultThemes setting';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         try {
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);

package/dist/m365/spo/commands/hidedefaultthemes/hidedefaultthemes-set.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 _SpoHideDefaultThemesSetCommand_instances, _SpoHideDefaultThemesSetCommand_initTelemetry, _SpoHideDefaultThemesSetCommand_initOptions, _SpoHideDefaultThemesSetCommand_initTypes;
+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';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    hideDefaultThemes: z.enum(['true', 'false']).transform(val => val === 'true')
+});
 class SpoHideDefaultThemesSetCommand extends SpoCommand {
     get name() {
         return commands.HIDEDEFAULTTHEMES_SET;
@@ -15,12 +15,8 @@ class SpoHideDefaultThemesSetCommand extends SpoCommand {
     get description() {
         return 'Sets the value of the HideDefaultThemes setting';
     }
-    constructor() {
-        super();
-        _SpoHideDefaultThemesSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoHideDefaultThemesSetCommand_instances, "m", _SpoHideDefaultThemesSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoHideDefaultThemesSetCommand_instances, "m", _SpoHideDefaultThemesSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoHideDefaultThemesSetCommand_instances, "m", _SpoHideDefaultThemesSetCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -45,19 +41,5 @@ class SpoHideDefaultThemesSetCommand extends SpoCommand {
         }
     }
 }
-_SpoHideDefaultThemesSetCommand_instances = new WeakSet(), _SpoHideDefaultThemesSetCommand_initTelemetry = function _SpoHideDefaultThemesSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            hideDefaultThemes: args.options.hideDefaultThemes
-        });
-    });
-}, _SpoHideDefaultThemesSetCommand_initOptions = function _SpoHideDefaultThemesSetCommand_initOptions() {
-    this.options.unshift({
-        option: '--hideDefaultThemes <hideDefaultThemes>',
-        autocomplete: ['true', 'false']
-    });
-}, _SpoHideDefaultThemesSetCommand_initTypes = function _SpoHideDefaultThemesSetCommand_initTypes() {
-    this.types.boolean.push('hideDefaultThemes');
-};
 export default new SpoHideDefaultThemesSetCommand();
 //# sourceMappingURL=hidedefaultthemes-set.js.map