@pnp/cli-microsoft365 12.0.0-beta.0be7d8d → 12.0.0-beta.10c5833

package/dist/Auth.js

@@ -262,7 +262,7 @@ export class Auth {
         return {
             auth: authConfig,
             cache: {
-                cachePlugin: msalCachePlugin
+                cachePlugin: await msalCachePlugin.getCachePlugin()
             },
             system: {
                 loggerOptions: {
@@ -735,8 +735,7 @@ export class Auth {
         await allConnectionsStorage.remove();
         // we need to manually clear MSAL cache, because MSAL doesn't have support
         // for logging out when using cert-based auth
-        const msalCache = this.getMsalCacheStorage();
-        await msalCache.remove();
+        await msalCachePlugin.clearMsalCache();
     }
     async removeConnectionInfo(connection, logger, debug) {
         const allConnections = await this.getAllConnections();
@@ -769,9 +768,6 @@ export class Auth {
     getConnectionStorage() {
         return new FileTokenStorage(FileTokenStorage.connectionInfoFilePath());
     }
-    getMsalCacheStorage() {
-        return new FileTokenStorage(FileTokenStorage.msalCacheFilePath());
-    }
     getAllConnectionsStorage() {
         return new FileTokenStorage(FileTokenStorage.allConnectionsFilePath());
     }

package/dist/auth/FileTokenStorage.js

@@ -2,9 +2,6 @@ import fs from 'fs';
 import os from 'os';
 import path from 'path';
 export class FileTokenStorage {
-    static msalCacheFilePath() {
-        return path.join(os.homedir(), '.cli-m365-msal.json');
-    }
     static connectionInfoFilePath() {
         return path.join(os.homedir(), '.cli-m365-connection.json');
     }

package/dist/auth/msalCachePlugin.js

@@ -1,29 +1,218 @@
-import { FileTokenStorage } from './FileTokenStorage.js';
-class MsalCachePlugin {
-    constructor() {
-        this.fileTokenStorage = new FileTokenStorage(FileTokenStorage.msalCacheFilePath());
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+import { lock } from 'proper-lockfile';
+const legacyCachePath = path.join(os.homedir(), '.cli-m365-msal.json');
+const fallbackCachePath = path.join(os.homedir(), '.cli-m365-msal-cache.json');
+const lockRetryCount = 500;
+const lockRetryDelay = 100;
+const staleLockThreshold = 10000;
+const persistenceConfiguration = {
+    cachePath: fallbackCachePath,
+    serviceName: 'cli-microsoft365',
+    accountName: 'msal-cache',
+    usePlaintextFileOnLinux: true
+};
+export const fileLock = { lock };
+let _initPromise;
+// Fallback ICachePlugin that stores tokens as plain JSON on disk.
+// @azure/msal-node-extensions ships a usePlaintextFileOnLinux option
+// for Linux systems without libsecret, but the package's barrel export
+// eagerly loads LibSecretPersistence which does `import keytar` at the
+// top level. When libsecret is missing, the entire dynamic import of
+// the package fails before any fallback logic can run. This class
+// provides equivalent file-based persistence without depending on the
+// package at all.
+// See: https://github.com/AzureAD/microsoft-authentication-library-for-js/issues/7170
+class FileCachePlugin {
+    constructor(cachePath) {
+        this.cachePath = cachePath;
     }
     async beforeCacheAccess(tokenCacheContext) {
+        await this.acquireLock();
         try {
-            const data = await this.fileTokenStorage.get();
-            tokenCacheContext.tokenCache.deserialize(data);
+            if (fs.existsSync(this.cachePath)) {
+                const data = fs.readFileSync(this.cachePath, 'utf8');
+                tokenCacheContext.tokenCache.deserialize(data);
+            }
         }
         catch {
             // Do nothing
         }
     }
     async afterCacheAccess(tokenCacheContext) {
-        if (!tokenCacheContext.cacheHasChanged) {
-            return;
-        }
         try {
-            await this.fileTokenStorage.set(tokenCacheContext.tokenCache.serialize());
+            if (tokenCacheContext.cacheHasChanged) {
+                if (fs.existsSync(this.cachePath)) {
+                    fs.chmodSync(this.cachePath, 0o600);
+                }
+                fs.writeFileSync(this.cachePath, tokenCacheContext.tokenCache.serialize(), { encoding: 'utf8', mode: 0o600 });
+            }
         }
         catch {
             // Do nothing
         }
+        finally {
+            await this.releaseLock();
+        }
+    }
+    async clearCache() {
+        await this.acquireLock();
+        try {
+            removeFile(this.cachePath);
+        }
+        finally {
+            await this.releaseLock();
+        }
+    }
+    async acquireLock() {
+        this.releaseCacheLock = await msalCachePlugin.acquireFileLock(this.cachePath);
+    }
+    async releaseLock() {
+        if (this.releaseCacheLock === undefined) {
+            return;
+        }
+        const releaseCacheLock = this.releaseCacheLock;
+        this.releaseCacheLock = undefined;
+        await releaseCacheLock();
+    }
+}
+class LockingCachePlugin {
+    constructor(plugin, lockPath) {
+        this.plugin = plugin;
+        this.lockPath = lockPath;
+    }
+    async beforeCacheAccess(tokenCacheContext) {
+        this.releaseCacheLock = await msalCachePlugin.acquireFileLock(this.lockPath);
+        try {
+            await this.plugin.beforeCacheAccess(tokenCacheContext);
+        }
+        catch (err) {
+            await this.releaseLock();
+            throw err;
+        }
+    }
+    async afterCacheAccess(tokenCacheContext) {
+        try {
+            await this.plugin.afterCacheAccess(tokenCacheContext);
+        }
+        finally {
+            await this.releaseLock();
+        }
+    }
+    async clearCache(clearCache) {
+        this.releaseCacheLock = await msalCachePlugin.acquireFileLock(this.lockPath);
+        try {
+            await clearCache();
+        }
+        finally {
+            await this.releaseLock();
+        }
+    }
+    async releaseLock() {
+        if (this.releaseCacheLock === undefined) {
+            return;
+        }
+        const releaseCacheLock = this.releaseCacheLock;
+        this.releaseCacheLock = undefined;
+        await releaseCacheLock();
     }
 }
-const msalCachePlugin = new MsalCachePlugin();
-export { msalCachePlugin };
+function removeFile(filePath) {
+    try {
+        fs.unlinkSync(filePath);
+    }
+    catch (err) {
+        if (err.code !== 'ENOENT') {
+            throw err;
+        }
+    }
+}
+export const msalCachePlugin = {
+    async acquireFileLock(cachePath) {
+        return await fileLock.lock(cachePath, {
+            lockfilePath: `${cachePath}.lockfile`,
+            realpath: false,
+            stale: staleLockThreshold,
+            update: staleLockThreshold / 2,
+            retries: {
+                retries: lockRetryCount,
+                factor: 1,
+                minTimeout: lockRetryDelay,
+                maxTimeout: lockRetryDelay,
+                randomize: false
+            }
+        });
+    },
+    async importMsalExtensions() {
+        return await import('@azure/msal-node-extensions');
+    },
+    async createNativePersistence() {
+        const { DataProtectionScope, PersistenceCachePlugin, PersistenceCreator } = await msalCachePlugin.importMsalExtensions();
+        const persistence = await PersistenceCreator.createPersistence({
+            ...persistenceConfiguration,
+            dataProtectionScope: DataProtectionScope.CurrentUser
+        });
+        const plugin = new LockingCachePlugin(new PersistenceCachePlugin(persistence), `${persistence.getFilePath()}.cli-m365`);
+        return {
+            plugin,
+            clearCache: async () => { await plugin.clearCache(async () => { await persistence.delete(); }); },
+            isFileFallback: false
+        };
+    },
+    createFileFallback() {
+        const plugin = new FileCachePlugin(persistenceConfiguration.cachePath);
+        return {
+            plugin,
+            clearCache: async () => { await plugin.clearCache(); },
+            isFileFallback: true
+        };
+    },
+    removeLegacyCache() {
+        removeFile(legacyCachePath);
+    },
+    async getCachePlugin() {
+        _initPromise ?? (_initPromise = (async () => {
+            msalCachePlugin.removeLegacyCache();
+            try {
+                return await msalCachePlugin.createNativePersistence();
+            }
+            catch (err) {
+                // Fall back to file-based cache only on Linux where libsecret
+                // may not be installed. On Windows (DPAPI) and macOS (Keychain)
+                // native persistence should always work.
+                if (process.platform === 'linux') {
+                    return msalCachePlugin.createFileFallback();
+                }
+                throw err;
+            }
+        })());
+        const { plugin } = await _initPromise;
+        return plugin;
+    },
+    async clearMsalCache() {
+        _initPromise ?? (_initPromise = (async () => {
+            msalCachePlugin.removeLegacyCache();
+            try {
+                return await msalCachePlugin.createNativePersistence();
+            }
+            catch (err) {
+                if (process.platform === 'linux') {
+                    return msalCachePlugin.createFileFallback();
+                }
+                throw err;
+            }
+        })());
+        const { clearCache, isFileFallback } = await _initPromise;
+        await clearCache();
+        // Also remove the file-based fallback cache to ensure no tokens
+        // remain if the machine previously used file-based persistence
+        if (!isFileFallback) {
+            await msalCachePlugin.createFileFallback().clearCache();
+        }
+    },
+    resetForTesting() {
+        _initPromise = undefined;
+    }
+};
 //# sourceMappingURL=msalCachePlugin.js.map

package/dist/m365/commands/logout.js

@@ -16,7 +16,6 @@ class LogoutCommand extends Command {
         if (this.verbose) {
             await logger.logToStderr('Logging out from Microsoft 365...');
         }
-        const deactivate = () => auth.connection.deactivate();
         try {
             await auth.clearConnectionInfo();
         }
@@ -24,10 +23,9 @@ class LogoutCommand extends Command {
             if (this.debug) {
                 await logger.logToStderr(new CommandError(error));
             }
+            throw new CommandError(error);
         }
-        finally {
-            deactivate();
-        }
+        auth.connection.deactivate();
     }
     async action(logger, args) {
         try {

package/dist/m365/entra/commands/m365group/m365group-remove.js

@@ -49,7 +49,7 @@ class EntraM365GroupRemoveCommand extends GraphCommand {
                 const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
                 // Delete the Microsoft 365 group site. This operation will also delete the group.
                 await this.deleteM365GroupSite(logger, siteUrl, spoAdminUrl);
-                if (args.options.skipRecycleBin) {
+                if (args.options.permanent) {
                     await this.deleteM365GroupFromRecycleBin(logger, groupId);
                     await this.deleteSiteFromRecycleBin(logger, siteUrl, spoAdminUrl);
                 }
@@ -169,7 +169,7 @@ _EntraM365GroupRemoveCommand_instances = new WeakSet(), _EntraM365GroupRemoveCom
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             force: (!(!args.options.force)).toString(),
-            skipRecycleBin: args.options.skipRecycleBin
+            permanent: !!args.options.permanent
         });
     });
 }, _EntraM365GroupRemoveCommand_initOptions = function _EntraM365GroupRemoveCommand_initOptions() {
@@ -180,7 +180,7 @@ _EntraM365GroupRemoveCommand_instances = new WeakSet(), _EntraM365GroupRemoveCom
     }, {
         option: '-f, --force'
     }, {
-        option: '--skipRecycleBin'
+        option: '--permanent'
     });
 }, _EntraM365GroupRemoveCommand_initValidators = function _EntraM365GroupRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -193,6 +193,7 @@ _EntraM365GroupRemoveCommand_instances = new WeakSet(), _EntraM365GroupRemoveCom
     this.optionSets.push({ options: ['id', 'displayName'] });
 }, _EntraM365GroupRemoveCommand_initTypes = function _EntraM365GroupRemoveCommand_initTypes() {
     this.types.string.push('id', 'displayName');
+    this.types.boolean.push('permanent');
 };
 EntraM365GroupRemoveCommand.maxRetries = 10;
 export default new EntraM365GroupRemoveCommand();

package/dist/m365/spe/commands/container/container-remove.js

@@ -11,7 +11,7 @@ export const options = z.strictObject({
     name: z.string().optional().alias('n'),
     containerTypeId: z.uuid().optional(),
     containerTypeName: z.string().optional(),
-    recycle: z.boolean().optional(),
+    permanent: z.boolean().optional(),
     force: z.boolean().optional().alias('f')
 });
 class SpeContainerRemoveCommand extends GraphCommand {
@@ -46,7 +46,7 @@ class SpeContainerRemoveCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         if (!args.options.force) {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove container '${args.options.id || args.options.name}'${!args.options.recycle ? ' permanently' : ''}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to ${args.options.permanent ? 'permanently remove' : 'recycle'} container '${args.options.id || args.options.name}'?` });
             if (!result) {
                 return;
             }
@@ -63,13 +63,12 @@ class SpeContainerRemoveCommand extends GraphCommand {
                 },
                 responseType: 'json'
             };
-            if (args.options.recycle) {
-                await request.delete(requestOptions);
+            if (args.options.permanent) {
+                requestOptions.url += '/permanentDelete';
+                await request.post(requestOptions);
                 return;
             }
-            // Container should be permanently deleted
-            requestOptions.url += '/permanentDelete';
-            await request.post(requestOptions);
+            await request.delete(requestOptions);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

package/dist/m365/spo/commands/homesite/homesite-list.js

@@ -1,7 +1,9 @@
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = globalOptionsZod.strict();
 class SpoHomeSiteListCommand extends SpoCommand {
     get name() {
         return commands.HOMESITE_LIST;
@@ -9,6 +11,9 @@ class SpoHomeSiteListCommand extends SpoCommand {
     get description() {
         return 'Lists all home sites';
     }
+    get schema() {
+        return options;
+    }
     defaultProperties() {
         return ['Url', 'Title'];
     }

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

@@ -38,7 +38,7 @@ class SpoListRemoveCommand extends SpoCommand {
             else {
                 requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting.encodeQueryParameter(args.options.title)}')`;
             }
-            if (args.options.recycle) {
+            if (!args.options.permanent) {
                 requestUrl += `/recycle`;
             }
             const requestOptions = {
@@ -75,7 +75,7 @@ _SpoListRemoveCommand_instances = new WeakSet(), _SpoListRemoveCommand_initTelem
             id: typeof args.options.id !== 'undefined',
             title: typeof args.options.title !== 'undefined',
             force: !!args.options.force,
-            recycle: !!args.options.recycle
+            permanent: !!args.options.permanent
         });
     });
 }, _SpoListRemoveCommand_initOptions = function _SpoListRemoveCommand_initOptions() {
@@ -86,7 +86,7 @@ _SpoListRemoveCommand_instances = new WeakSet(), _SpoListRemoveCommand_initTelem
     }, {
         option: '-t, --title [title]'
     }, {
-        option: '--recycle'
+        option: '--permanent'
     }, {
         option: '-f, --force'
     });
@@ -106,7 +106,7 @@ _SpoListRemoveCommand_instances = new WeakSet(), _SpoListRemoveCommand_initTelem
     this.optionSets.push({ options: ['id', 'title'] });
 }, _SpoListRemoveCommand_initTypes = function _SpoListRemoveCommand_initTypes() {
     this.types.string.push('id', 'title', 'webUrl');
-    this.types.boolean.push('force', 'recycle');
+    this.types.boolean.push('force', 'permanent');
 };
 export default new SpoListRemoveCommand();
 //# sourceMappingURL=list-remove.js.map

package/dist/m365/spo/commands/listitem/listitem-batch-remove.js

@@ -56,7 +56,7 @@ class SpoListItemBatchRemoveCommand extends SpoCommand {
             await removeListItems();
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the list items from list ${args.options.listId || args.options.listTitle || args.options.listUrl} 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 list items from list ${args.options.listId || args.options.listTitle || args.options.listUrl} located in site ${args.options.webUrl}?` });
             if (result) {
                 await removeListItems();
             }
@@ -142,7 +142,7 @@ class SpoListItemBatchRemoveCommand extends SpoCommand {
             requestUrl += `GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
         }
         requestUrl += `/items(${item})`;
-        if (options.recycle) {
+        if (!options.permanent) {
             requestUrl += '/recycle()';
         }
         return requestUrl;
@@ -156,7 +156,7 @@ _SpoListItemBatchRemoveCommand_instances = new WeakSet(), _SpoListItemBatchRemov
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
-            recycle: !!args.options.recycle,
+            permanent: !!args.options.permanent,
             force: !!args.options.force
         });
     });
@@ -174,7 +174,7 @@ _SpoListItemBatchRemoveCommand_instances = new WeakSet(), _SpoListItemBatchRemov
     }, {
         option: '-i, --ids [ids]'
     }, {
-        option: '-r, --recycle'
+        option: '--permanent'
     }, {
         option: '-f, --force'
     });
@@ -213,6 +213,7 @@ _SpoListItemBatchRemoveCommand_instances = new WeakSet(), _SpoListItemBatchRemov
     });
 }, _SpoListItemBatchRemoveCommand_initTypes = function _SpoListItemBatchRemoveCommand_initTypes() {
     this.types.string.push('webUrl', 'listId', 'listTitle', 'listUrl', 'ids', 'filePath');
+    this.types.boolean.push('permanent', 'force');
 }, _SpoListItemBatchRemoveCommand_initOptionSets = function _SpoListItemBatchRemoveCommand_initOptionSets() {
     this.optionSets.push({
         options: ['listId', 'listTitle', 'listUrl']