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

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']

package/dist/m365/spo/commands/listitem/listitem-get.js

@@ -30,6 +30,12 @@ class SpoListItemGetCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoListItemGetCommand_instances, "m", _SpoListItemGetCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        if (args.options.properties) {
+            await this.warn(logger, `Option 'properties' is deprecated. Please use 'fields' instead.`);
+            if (!args.options.fields) {
+                args.options.fields = args.options.properties;
+            }
+        }
         let requestUrl = `${args.options.webUrl}/_api/web`;
         if (args.options.listId) {
             requestUrl += `/lists(guid'${formatting.encodeQueryParameter(args.options.listId)}')`;
@@ -41,11 +47,11 @@ class SpoListItemGetCommand extends SpoCommand {
             const listServerRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
             requestUrl += `/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
         }
-        const propertiesSelect = args.options.properties ? args.options.properties.split(',') : [];
-        const propertiesWithSlash = propertiesSelect.filter(item => item.includes('/'));
-        const propertiesToExpand = propertiesWithSlash.map(e => e.split('/')[0]);
-        const expandPropertiesArray = propertiesToExpand.filter((item, pos) => propertiesToExpand.indexOf(item) === pos);
-        const fieldExpand = expandPropertiesArray.length > 0 ? `&$expand=${expandPropertiesArray.join(",")}` : ``;
+        const fieldsSelect = args.options.fields ? args.options.fields.split(',') : [];
+        const fieldsWithSlash = fieldsSelect.filter(item => item.includes('/'));
+        const fieldsToExpand = fieldsWithSlash.map(e => e.split('/')[0]);
+        const expandFieldsArray = fieldsToExpand.filter((item, pos) => fieldsToExpand.indexOf(item) === pos);
+        const fieldExpand = expandFieldsArray.length > 0 ? `&$expand=${expandFieldsArray.join(",")}` : ``;
         if (args.options.id) {
             requestUrl += `/items(${args.options.id})`;
         }
@@ -53,7 +59,7 @@ class SpoListItemGetCommand extends SpoCommand {
             requestUrl += `/GetItemByUniqueId(guid'${args.options.uniqueId}')`;
         }
         const requestOptions = {
-            url: `${requestUrl}?$select=${formatting.encodeQueryParameter(propertiesSelect.join(","))}${fieldExpand}`,
+            url: `${requestUrl}?$select=${formatting.encodeQueryParameter(fieldsSelect.join(","))}${fieldExpand}`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
@@ -101,6 +107,8 @@ _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTel
         option: '-t, --listTitle [listTitle]'
     }, {
         option: '--listUrl [listUrl]'
+    }, {
+        option: '--fields [fields]'
     }, {
         option: '-p, --properties [properties]'
     }, {
@@ -127,7 +135,7 @@ _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTel
         return true;
     });
 }, _SpoListItemGetCommand_initTypes = function _SpoListItemGetCommand_initTypes() {
-    this.types.string.push('webUrl', 'listId', 'listTitle', 'id', 'uniqueId', 'properties');
+    this.types.string.push('webUrl', 'listId', 'listTitle', 'id', 'uniqueId', 'fields', 'properties');
 }, _SpoListItemGetCommand_initOptionSets = function _SpoListItemGetCommand_initOptionSets() {
     this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['id', 'uniqueId'] });
 };

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

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoListItemRemoveCommand_instances, _SpoListItemRemoveCommand_initTelemetry, _SpoListItemRemoveCommand_initOptions, _SpoListItemRemoveCommand_initValidators, _SpoListItemRemoveCommand_initOptionSets;
+var _SpoListItemRemoveCommand_instances, _SpoListItemRemoveCommand_initTelemetry, _SpoListItemRemoveCommand_initOptions, _SpoListItemRemoveCommand_initValidators, _SpoListItemRemoveCommand_initOptionSets, _SpoListItemRemoveCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -25,6 +25,7 @@ class SpoListItemRemoveCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoListItemRemoveCommand_instances, "m", _SpoListItemRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListItemRemoveCommand_instances, "m", _SpoListItemRemoveCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoListItemRemoveCommand_instances, "m", _SpoListItemRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoListItemRemoveCommand_instances, "m", _SpoListItemRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const removeListItem = async () => {
@@ -43,7 +44,7 @@ class SpoListItemRemoveCommand extends SpoCommand {
                 requestUrl += `/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
             }
             requestUrl += `/items(${args.options.id})`;
-            if (args.options.recycle) {
+            if (!args.options.permanent) {
                 requestUrl += `/recycle()`;
             }
             const requestOptions = {
@@ -68,7 +69,7 @@ class SpoListItemRemoveCommand extends SpoCommand {
             await removeListItem();
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the list item ${args.options.id} 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 item ${args.options.id} from list ${args.options.listId || args.options.listTitle || args.options.listUrl} located in site ${args.options.webUrl}?` });
             if (result) {
                 await removeListItem();
             }
@@ -81,7 +82,7 @@ _SpoListItemRemoveCommand_instances = new WeakSet(), _SpoListItemRemoveCommand_i
             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
         });
     });
@@ -97,7 +98,7 @@ _SpoListItemRemoveCommand_instances = new WeakSet(), _SpoListItemRemoveCommand_i
     }, {
         option: '--listUrl [listUrl]'
     }, {
-        option: '--recycle'
+        option: '--permanent'
     }, {
         option: '-f, --force'
     });
@@ -119,6 +120,8 @@ _SpoListItemRemoveCommand_instances = new WeakSet(), _SpoListItemRemoveCommand_i
     });
 }, _SpoListItemRemoveCommand_initOptionSets = function _SpoListItemRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
+}, _SpoListItemRemoveCommand_initTypes = function _SpoListItemRemoveCommand_initTypes() {
+    this.types.boolean.push('permanent', 'force');
 };
 export default new SpoListItemRemoveCommand();
 //# sourceMappingURL=listitem-remove.js.map

package/dist/m365/spo/commands/page/page-header-set.js

@@ -155,19 +155,6 @@ class SpoPageHeaderSetCommand extends SpoCommand {
             else {
                 pageData = await Page.checkout(pageFullName, args.options.webUrl, logger, this.verbose);
             }
-            let header;
-            switch (args.options.type) {
-                case 'None':
-                    header = noPageHeader;
-                    break;
-                case 'Custom':
-                    header = customPageHeader;
-                    break;
-                case 'Default':
-                default:
-                    header = defaultPageHeader;
-                    break;
-            }
             if (pageData) {
                 canvasContent = pageData.CanvasContent1;
                 authorByline = authorByline.length > 0 ? authorByline : pageData.AuthorByline;
@@ -180,63 +167,135 @@ class SpoPageHeaderSetCommand extends SpoCommand {
             //In the new design page header is is a configurable Banner webpart in the first full-width section
             const headerControl = pageControls.find(control => control?.position?.zoneIndex === 1 && control?.position?.sectionFactor === 0 && control?.webPartId === BannerWebPartId);
             const isStandardPageHeader = pageData.LayoutWebpartsContent !== '[]';
-            //LayoutWebpartsContent represents standard page header
-            if (!isStandardPageHeader) {
-                header = headerControl?.webPartData || header;
+            const existingHeader = isStandardPageHeader && typeof pageData.LayoutWebpartsContent === 'string'
+                ? JSON.parse(pageData.LayoutWebpartsContent)[0]
+                : headerControl?.webPartData;
+            let header;
+            switch (args.options.type) {
+                case 'None':
+                    header = noPageHeader;
+                    break;
+                case 'Custom':
+                    header = customPageHeader;
+                    break;
+                case 'Default':
+                    header = defaultPageHeader;
+                    break;
+                default:
+                    header = existingHeader || defaultPageHeader;
+                    break;
+            }
+            if (existingHeader && args.options.type !== 'None') {
+                if (typeof args.options.textAlignment === 'undefined') {
+                    header.properties.textAlignment = existingHeader.properties.textAlignment;
+                }
+                if (typeof args.options.showTopicHeader === 'undefined') {
+                    header.properties.showTopicHeader = existingHeader.properties.showTopicHeader;
+                }
+                if (typeof args.options.topicHeader === 'undefined') {
+                    header.properties.topicHeader = existingHeader.properties.topicHeader;
+                }
+                if (typeof args.options.showPublishDate === 'undefined') {
+                    header.properties.showPublishDate = existingHeader.properties.showPublishDate;
+                }
+                if (typeof args.options.showTimeToRead === 'undefined') {
+                    header.properties.showTimeToRead = existingHeader.properties.showTimeToRead;
+                }
+                if (typeof args.options.layout === 'undefined') {
+                    header.properties.layoutType = existingHeader.properties.layoutType;
+                }
+                if (header.properties.imageSourceType === 2 && existingHeader.properties.imageSourceType === 2) {
+                    const properties = header.properties;
+                    const existingProperties = existingHeader.properties;
+                    if (typeof args.options.altText === 'undefined') {
+                        properties.altText = existingProperties.altText;
+                    }
+                    if (typeof args.options.translateX === 'undefined') {
+                        properties.translateX = existingProperties.translateX;
+                    }
+                    if (typeof args.options.translateY === 'undefined') {
+                        properties.translateY = existingProperties.translateY;
+                    }
+                    if (typeof args.options.imageUrl === 'undefined') {
+                        properties.listId = existingProperties.listId;
+                        properties.siteId = existingProperties.siteId;
+                        properties.uniqueId = existingProperties.uniqueId;
+                        properties.webId = existingProperties.webId;
+                        header.serverProcessedContent = existingHeader.serverProcessedContent;
+                    }
+                }
             }
             header.properties.title = title;
-            header.properties.textAlignment = args.options.textAlignment || 'Left';
-            header.properties.showTopicHeader = args.options.showTopicHeader || false;
-            header.properties.topicHeader = args.options.topicHeader || '';
-            header.properties.showPublishDate = args.options.showPublishDate || false;
-            header.properties.showTimeToRead = args.options.showTimeToRead || false;
-            if (args.options.type !== 'None') {
-                header.properties.layoutType = args.options.layout || 'FullWidthImage';
+            if (typeof args.options.textAlignment !== 'undefined') {
+                header.properties.textAlignment = args.options.textAlignment;
             }
-            if (args.options.type === 'Custom') {
-                header.serverProcessedContent.imageSources = {
-                    imageSource: args.options.imageUrl || ''
-                };
+            if (typeof args.options.showTopicHeader !== 'undefined') {
+                header.properties.showTopicHeader = args.options.showTopicHeader;
+            }
+            if (typeof args.options.topicHeader !== 'undefined') {
+                header.properties.topicHeader = args.options.topicHeader;
+            }
+            if (typeof args.options.showPublishDate !== 'undefined') {
+                header.properties.showPublishDate = args.options.showPublishDate;
+            }
+            if (typeof args.options.showTimeToRead !== 'undefined') {
+                header.properties.showTimeToRead = args.options.showTimeToRead;
+            }
+            if (args.options.type !== 'None' && typeof args.options.layout !== 'undefined') {
+                header.properties.layoutType = args.options.layout;
+            }
+            if (header.properties.imageSourceType === 2) {
                 const properties = header.properties;
-                properties.altText = args.options.altText || '';
-                properties.translateX = args.options.translateX || 0;
-                properties.translateY = args.options.translateY || 0;
-                header.properties = properties;
-                if (!args.options.imageUrl) {
-                    header.serverProcessedContent.customMetadata = {
-                        imageSource: {
-                            siteId: '',
-                            webId: '',
-                            listId: '',
-                            uniqueId: ''
-                        }
-                    };
-                    properties.listId = '';
-                    properties.siteId = '';
-                    properties.uniqueId = '';
-                    properties.webId = '';
-                    header.properties = properties;
+                if (typeof args.options.altText !== 'undefined') {
+                    properties.altText = args.options.altText;
                 }
-                else {
-                    const res = await Promise.all([
-                        spo.getSiteIdBySPApi(args.options.webUrl, logger, this.verbose),
-                        spo.getWebId(args.options.webUrl, logger, this.verbose),
-                        this.getImageInfo(args.options.webUrl, args.options.imageUrl, this.verbose, logger)
-                    ]);
-                    header.serverProcessedContent.customMetadata = {
-                        imageSource: {
-                            siteId: res[0],
-                            webId: res[1],
-                            listId: res[2].ListId,
-                            uniqueId: res[2].UniqueId
-                        }
+                if (typeof args.options.translateX !== 'undefined') {
+                    properties.translateX = args.options.translateX;
+                }
+                if (typeof args.options.translateY !== 'undefined') {
+                    properties.translateY = args.options.translateY;
+                }
+                header.properties = properties;
+                if (typeof args.options.imageUrl !== 'undefined') {
+                    header.serverProcessedContent.imageSources = {
+                        imageSource: args.options.imageUrl
                     };
-                    const properties = header.properties;
-                    properties.listId = res[2].ListId;
-                    properties.siteId = res[0];
-                    properties.uniqueId = res[2].UniqueId;
-                    properties.webId = res[1];
-                    header.properties = properties;
+                    if (!args.options.imageUrl) {
+                        header.serverProcessedContent.customMetadata = {
+                            imageSource: {
+                                siteId: '',
+                                webId: '',
+                                listId: '',
+                                uniqueId: ''
+                            }
+                        };
+                        properties.listId = '';
+                        properties.siteId = '';
+                        properties.uniqueId = '';
+                        properties.webId = '';
+                        header.properties = properties;
+                    }
+                    else {
+                        const res = await Promise.all([
+                            spo.getSiteIdBySPApi(args.options.webUrl, logger, this.verbose),
+                            spo.getWebId(args.options.webUrl, logger, this.verbose),
+                            this.getImageInfo(args.options.webUrl, args.options.imageUrl, this.verbose, logger)
+                        ]);
+                        header.serverProcessedContent.customMetadata = {
+                            imageSource: {
+                                siteId: res[0],
+                                webId: res[1],
+                                listId: res[2].ListId,
+                                uniqueId: res[2].UniqueId
+                            }
+                        };
+                        const properties = header.properties;
+                        properties.listId = res[2].ListId;
+                        properties.siteId = res[0];
+                        properties.uniqueId = res[2].UniqueId;
+                        properties.webId = res[1];
+                        header.properties = properties;
+                    }
                 }
             }
             const requestBody = {

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

@@ -58,12 +58,12 @@ class SpoPageRemoveCommand extends SpoCommand {
             if (args.options.bypassSharedLock) {
                 requestOptions.headers.Prefer = 'bypass-shared-lock';
             }
-            if (args.options.recycle) {
-                requestOptions.url += '/Recycle';
-                await request.post(requestOptions);
+            if (args.options.permanent) {
+                await request.delete(requestOptions);
             }
             else {
-                await request.delete(requestOptions);
+                requestOptions.url += '/Recycle';
+                await request.post(requestOptions);
             }
         }
         catch (err) {
@@ -75,7 +75,7 @@ _SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initTelem
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             force: !!args.options.force,
-            recycle: !!args.options.recycle,
+            permanent: !!args.options.permanent,
             bypassSharedLock: !!args.options.bypassSharedLock
         });
     });
@@ -85,7 +85,7 @@ _SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initTelem
     }, {
         option: '-n, --name <name>'
     }, {
-        option: '--recycle'
+        option: '--permanent'
     }, {
         option: '--bypassSharedLock'
     }, {
@@ -95,7 +95,7 @@ _SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initTelem
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
 }, _SpoPageRemoveCommand_initTypes = function _SpoPageRemoveCommand_initTypes() {
     this.types.string.push('name', 'webUrl');
-    this.types.boolean.push('force', 'bypassSharedLock', 'recycle');
+    this.types.boolean.push('force', 'bypassSharedLock', 'permanent');
 };
 export default new SpoPageRemoveCommand();
 //# sourceMappingURL=page-remove.js.map

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

@@ -1,15 +1,32 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SpoSiteListCommand_instances, _SpoSiteListCommand_initTelemetry, _SpoSiteListCommand_initOptions, _SpoSiteListCommand_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 { zod } from '../../../../utils/zod.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+var SiteListType;
+(function (SiteListType) {
+    SiteListType["TeamSite"] = "TeamSite";
+    SiteListType["CommunicationSite"] = "CommunicationSite";
+})(SiteListType || (SiteListType = {}));
+var SiteListState;
+(function (SiteListState) {
+    SiteListState["active"] = "active";
+    SiteListState["fullyArchived"] = "fullyArchived";
+    SiteListState["recentlyArchived"] = "recentlyArchived";
+    SiteListState["archived"] = "archived";
+})(SiteListState || (SiteListState = {}));
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    type: zod.coercedEnum(SiteListType).optional().alias('t'),
+    state: zod.coercedEnum(SiteListState).optional(),
+    webTemplate: z.string().optional(),
+    filter: z.string().optional(),
+    withOneDriveSites: z.boolean().optional()
+});
 class SpoSiteListCommand extends SpoCommand {
     get name() {
         return commands.SITE_LIST;
@@ -20,12 +37,20 @@ class SpoSiteListCommand extends SpoCommand {
     defaultProperties() {
         return ['Title', 'Url'];
     }
-    constructor() {
-        super();
-        _SpoSiteListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSiteListCommand_instances, "m", _SpoSiteListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoSiteListCommand_instances, "m", _SpoSiteListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSiteListCommand_instances, "m", _SpoSiteListCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(o => !(o.type && o.webTemplate), {
+            message: 'Specify either type or webTemplate, but not both'
+        })
+            .refine(o => !(o.withOneDriveSites && (o.type !== undefined || o.webTemplate !== undefined)), {
+            message: `When using withOneDriveSites, don't specify the type or webTemplate options`
+        })
+            .refine(o => !(o.withOneDriveSites && o.state !== undefined), {
+            message: `When using withOneDriveSites, don't specify the state option`
+        });
     }
     alias() {
         return [commands.SITE_LIST];
@@ -34,13 +59,14 @@ class SpoSiteListCommand extends SpoCommand {
         const webTemplate = this.getWebTemplateId(args.options);
         const includeOneDriveSites = args.options.withOneDriveSites || false;
         const personalSite = includeOneDriveSites === false ? '0' : '1';
+        const effectiveFilter = this.buildFilter(args.options);
         try {
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             if (this.verbose) {
                 await logger.logToStderr(`Retrieving list of site collections...`);
             }
             this.allSites = [];
-            await this.getAllSites(spoAdminUrl, formatting.escapeXml(args.options.filter || ''), '0', personalSite, webTemplate, undefined, logger);
+            await this.getAllSites(spoAdminUrl, formatting.escapeXml(effectiveFilter), '0', personalSite, webTemplate, undefined, logger);
             await logger.log(this.allSites);
         }
         catch (err) {
@@ -88,43 +114,28 @@ class SpoSiteListCommand extends SpoCommand {
                 return '';
         }
     }
-}
-_SpoSiteListCommand_instances = new WeakSet(), _SpoSiteListCommand_initTelemetry = function _SpoSiteListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            webTemplate: args.options.webTemplate,
-            type: args.options.type,
-            filter: (!(!args.options.filter)).toString(),
-            withOneDriveSites: typeof args.options.withOneDriveSites !== 'undefined'
-        });
-    });
-}, _SpoSiteListCommand_initOptions = function _SpoSiteListCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --type [type]',
-        autocomplete: ['TeamSite', 'CommunicationSite']
-    }, {
-        option: '--webTemplate [webTemplate]'
-    }, {
-        option: '--filter [filter]'
-    }, {
-        option: '--withOneDriveSites'
-    });
-}, _SpoSiteListCommand_initValidators = function _SpoSiteListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.type && args.options.webTemplate) {
-            return 'Specify either type or webTemplate, but not both';
+    buildFilter(options) {
+        const providedFilter = options.filter || '';
+        let stateFilter = '';
+        switch (options.state) {
+            case 'active':
+                stateFilter = `ArchiveStatus -eq 'NotArchived'`;
+                break;
+            case 'fullyArchived':
+                stateFilter = `ArchiveStatus -eq 'FullyArchived'`;
+                break;
+            case 'recentlyArchived':
+                stateFilter = `ArchiveStatus -eq 'RecentlyArchived'`;
+                break;
+            case 'archived':
+                stateFilter = `ArchiveStatus -ne 'NotArchived'`;
+                break;
         }
-        const typeValues = ['TeamSite', 'CommunicationSite'];
-        if (args.options.type &&
-            typeValues.indexOf(args.options.type) < 0) {
-            return `${args.options.type} is not a valid value for the type option. Allowed values are ${typeValues.join('|')}`;
+        if (stateFilter && providedFilter) {
+            return `${providedFilter} and ${stateFilter}`;
         }
-        if (args.options.withOneDriveSites
-            && (args.options.type || args.options.webTemplate)) {
-            return 'When using withOneDriveSites, don\'t specify the type or webTemplate options';
-        }
-        return true;
-    });
-};
+        return stateFilter || providedFilter;
+    }
+}
 export default new SpoSiteListCommand();
 //# sourceMappingURL=site-list.js.map