@pnp/cli-microsoft365 10.10.0-beta.eb74779 → 10.11.0-beta.24af61c

package/dist/m365/spo/commands/list/list-view-add.js

@@ -1,53 +1,126 @@
-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 _SpoListViewAddCommand_instances, _SpoListViewAddCommand_initTelemetry, _SpoListViewAddCommand_initOptions, _SpoListViewAddCommand_initValidators, _SpoListViewAddCommand_initOptionSets;
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { z } from 'zod';
+import { zod } from '../../../../utils/zod.js';
+const options = globalOptionsZod
+    .extend({
+    webUrl: zod.alias('u', z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        message: 'webUrl is not a valid SharePoint site URL.'
+    })),
+    listId: z.string()
+        .refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    listTitle: z.string().optional(),
+    listUrl: z.string().optional(),
+    title: z.string().min(1, 'Cannot be empty.'),
+    fields: z.string().optional(),
+    viewQuery: z.string().optional(),
+    personal: z.boolean().optional(),
+    default: z.boolean().optional(),
+    paged: z.boolean().optional(),
+    rowLimit: z.number().int().positive().optional(),
+    customFormatter: z.string()
+        .refine(formatter => {
+        try {
+            JSON.parse(formatter);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }, {
+        message: 'Custom formatter must be a valid JSON string.'
+    })
+        .optional(),
+    type: z.enum(['list', 'calendar', 'gallery', 'kanban']).optional(),
+    calendarStartDateField: z.string().min(1, 'Cannot be empty.').optional(),
+    calendarEndDateField: z.string().min(1, 'Cannot be empty.').optional(),
+    calendarTitleField: z.string().min(1, 'Cannot be empty.').optional(),
+    calendarSubTitleField: z.string().min(1, 'Cannot be empty.').optional(),
+    calendarDefaultLayout: z.enum(['month', 'week', 'workWeek', 'day']).optional(),
+    kanbanBucketField: z.string().min(1, 'Cannot be empty.').optional()
+})
+    .strict();
 class SpoListViewAddCommand extends SpoCommand {
     get name() {
         return commands.LIST_VIEW_ADD;
     }
     get description() {
-        return 'Adds a new view to a SharePoint list.';
+        return 'Adds a new view to a SharePoint list';
     }
-    constructor() {
-        super();
-        _SpoListViewAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoListViewAddCommand_instances, "m", _SpoListViewAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoListViewAddCommand_instances, "m", _SpoListViewAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoListViewAddCommand_instances, "m", _SpoListViewAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoListViewAddCommand_instances, "m", _SpoListViewAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine((options) => [options.listId, options.listTitle, options.listUrl].filter(o => o !== undefined).length === 1, {
+            message: 'Use one of the following options: listId, listTitle, or listUrl.'
+        })
+            .refine((options) => !options.personal || !options.default, {
+            message: 'Default view cannot be a personal view.'
+        })
+            .refine((options) => options.type !== 'calendar' || [options.calendarStartDateField, options.calendarEndDateField, options.calendarTitleField].filter(o => o === undefined).length === 0, {
+            message: 'When type is calendar, do specify calendarStartDateField, calendarEndDateField, and calendarTitleField.'
+        })
+            .refine((options) => options.type === 'calendar' || [options.calendarStartDateField, options.calendarEndDateField, options.calendarTitleField].filter(o => o === undefined).length === 3, {
+            message: 'When type is not calendar, do not specify calendarStartDateField, calendarEndDateField, and calendarTitleField.'
+        })
+            .refine((options) => options.type !== 'kanban' || options.kanbanBucketField !== undefined, {
+            message: 'When type is kanban, do specify kanbanBucketField.'
+        })
+            .refine((options) => options.type === 'kanban' || options.kanbanBucketField === undefined, {
+            message: 'When type is not kanban, do not specify kanbanBucketField.'
+        })
+            .refine((options) => options.type === 'calendar' || options.fields !== undefined, {
+            message: 'When type is not calendar, do specify fields.'
+        });
     }
     async commandAction(logger, args) {
-        const requestOptions = {
-            url: this.getRestUrl(args.options),
-            headers: {
-                'content-type': 'application/json;odata=verbose',
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json',
-            data: {
-                parameters: {
-                    Title: args.options.title,
-                    ViewFields: {
-                        results: args.options.fields.split(',')
-                    },
-                    Query: args.options.viewQuery,
-                    PersonalView: !!args.options.personal,
-                    SetAsDefaultView: !!args.options.default,
-                    Paged: !!args.options.paged,
-                    RowLimit: args.options.rowLimit ? +args.options.rowLimit : 30
-                }
-            }
-        };
         try {
+            if (this.verbose) {
+                await logger.logToStderr(`Adding view '${args.options.title}' to list...`);
+            }
+            let apiUrl = `${args.options.webUrl}/_api/web/`;
+            if (args.options.listId) {
+                apiUrl += `lists(guid'${formatting.encodeQueryParameter(args.options.listId)}')`;
+            }
+            else if (args.options.listTitle) {
+                apiUrl += `lists/getByTitle('${formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            }
+            else if (args.options.listUrl) {
+                apiUrl += `GetList('${formatting.encodeQueryParameter(urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl))}')`;
+            }
+            apiUrl += '/views/add';
+            const requestOptions = {
+                url: apiUrl,
+                headers: {
+                    'content-type': 'application/json;odata=verbose',
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json',
+                data: {
+                    parameters: {
+                        Title: args.options.title,
+                        ViewFields: {
+                            results: args.options.fields?.split(',').map(f => f.trim()) ?? []
+                        },
+                        Query: args.options.viewQuery,
+                        PersonalView: !!args.options.personal,
+                        SetAsDefaultView: !!args.options.default,
+                        Paged: !!args.options.paged,
+                        RowLimit: args.options.rowLimit ?? 30,
+                        CustomFormatter: args.options.customFormatter
+                    }
+                }
+            };
+            this.setViewTypeSpecificParameters(args.options, requestOptions.data.parameters);
             const result = await request.post(requestOptions);
             await logger.log(result);
         }
@@ -55,62 +128,42 @@ class SpoListViewAddCommand extends SpoCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    getRestUrl(options) {
-        let result = `${options.webUrl}/_api/web/`;
-        if (options.listId) {
-            result += `lists(guid'${formatting.encodeQueryParameter(options.listId)}')`;
-        }
-        else if (options.listTitle) {
-            result += `lists/getByTitle('${formatting.encodeQueryParameter(options.listTitle)}')`;
-        }
-        else if (options.listUrl) {
-            result += `GetList('${formatting.encodeQueryParameter(urlUtil.getServerRelativePath(options.webUrl, options.listUrl))}')`;
-        }
-        result += '/views/add';
-        return result;
-    }
-}
-_SpoListViewAddCommand_instances = new WeakSet(), _SpoListViewAddCommand_initTelemetry = function _SpoListViewAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            listId: typeof args.options.listId !== 'undefined',
-            listTitle: typeof args.options.listTitle !== 'undefined',
-            listUrl: typeof args.options.listUrl !== 'undefined',
-            title: typeof args.options.title !== 'undefined',
-            viewQuery: typeof args.options.viewQuery !== 'undefined',
-            personal: !!args.options.personal,
-            default: !!args.options.default,
-            orderedView: !!args.options.orderedView,
-            paged: !!args.options.paged,
-            rowLimit: typeof args.options.rowLimit !== 'undefined'
-        });
-    });
-}, _SpoListViewAddCommand_initOptions = function _SpoListViewAddCommand_initOptions() {
-    this.options.unshift({ option: '-u, --webUrl <webUrl>' }, { option: '--listId [listId]' }, { option: '--listTitle [listTitle]' }, { option: '--listUrl [listUrl]' }, { option: '--title <title>' }, { option: '--fields <fields>' }, { option: '--viewQuery [viewQuery]' }, { option: '--personal' }, { option: '--default' }, { option: '--paged' }, { option: '--rowLimit [rowLimit]' });
-}, _SpoListViewAddCommand_initValidators = function _SpoListViewAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const webUrlValidation = validation.isValidSharePointUrl(args.options.webUrl);
-        if (webUrlValidation !== true) {
-            return webUrlValidation;
+    setViewTypeSpecificParameters(options, requestBody) {
+        if (options.type === 'calendar') {
+            const defaultView = options.calendarDefaultLayout ?? 'month';
+            const titleField = options.calendarTitleField;
+            const subTitleField = options.calendarSubTitleField ?? '';
+            // Following fields are required for calendar view, order is important
+            const viewFields = [options.calendarStartDateField, options.calendarEndDateField, titleField, subTitleField].filter(field => field !== '');
+            // Add any additional fields specified by the user
+            const extraViewFields = requestBody.ViewFields.results.filter((field) => !viewFields.includes(field.trim()));
+            viewFields.push(...extraViewFields);
+            requestBody.CalendarViewStyles = `<CalendarViewStyle Title="Day" Type="day" Template="CalendarViewdayChrome" Sequence="1" Default="${String(defaultView === 'day').toUpperCase()}" /><CalendarViewStyle Title="Week" Type="week" Template="CalendarViewweekChrome" Sequence="2" Default="${String(defaultView === 'week').toUpperCase()}" /><CalendarViewStyle Title="Month" Type="month" Template="CalendarViewmonthChrome" Sequence="3" Default="${String(defaultView === 'month').toUpperCase()}" /><CalendarViewStyle Title="Work week" Type="workweek" Template="CalendarViewweekChrome" Sequence="4" Default="${String(defaultView === 'workWeek').toUpperCase()}" />`;
+            requestBody.Query = `<Where><DateRangesOverlap><FieldRef Name='${options.calendarStartDateField}' /><FieldRef Name='${options.calendarEndDateField}' /><Value Type='DateTime'><Month /></Value></DateRangesOverlap></Where>`;
+            requestBody.ViewData = `<FieldRef Name="${titleField}" Type="CalendarMonthTitle" /><FieldRef Name="${titleField}" Type="CalendarWeekTitle" /><FieldRef Name="${subTitleField}" Type="CalendarWeekLocation" /><FieldRef Name="${titleField}" Type="CalendarDayTitle" /><FieldRef Name="${subTitleField}" Type="CalendarDayLocation" />`;
+            requestBody.ViewFields.results = viewFields;
+            requestBody.ViewType2 = 'MODERNCALENDAR';
+            return;
         }
-        if (args.options.listId && !validation.isValidGuid(args.options.listId)) {
-            return `${args.options.listId} in option listId is not a valid GUID`;
+        if (options.type === 'gallery') {
+            requestBody.ViewType2 = 'TILES';
+            return;
         }
-        if (args.options.rowLimit !== undefined) {
-            if (isNaN(args.options.rowLimit)) {
-                return `${args.options.rowLimit} is not a number`;
+        if (options.type === 'kanban') {
+            // Add the bucket field to the view fields if it is not already included
+            const viewFields = requestBody.ViewFields.results;
+            if (!viewFields.includes(options.kanbanBucketField)) {
+                viewFields.push(options.kanbanBucketField);
             }
-            if (+args.options.rowLimit <= 0) {
-                return 'rowLimit option must be greater than 0.';
+            if (!options.customFormatter) {
+                requestBody.CustomFormatter = '{}';
             }
+            requestBody.ViewData = `<FieldRef Name="${options.kanbanBucketField}" Type="KanbanPivotColumn" />`;
+            requestBody.ViewType2 = 'KANBAN';
+            return;
         }
-        if (args.options.personal && args.options.default) {
-            return 'Default view cannot be a personal view.';
-        }
-        return true;
-    });
-}, _SpoListViewAddCommand_initOptionSets = function _SpoListViewAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
-};
+    }
+    ;
+}
 export default new SpoListViewAddCommand();
 //# sourceMappingURL=list-view-add.js.map

package/dist/m365/spo/commands/page/Page.js

@@ -72,10 +72,14 @@ export class Page {
         return output;
     }
     static getSectionInformation(section, isJSONOutput) {
-        return {
-            order: section.order,
-            columns: section.columns.map(column => this.getColumnsInformation(column, isJSONOutput))
+        const sectionOutput = {
+            order: section.order
         };
+        if (this.isVerticalSection(section)) {
+            sectionOutput.isVertical = true;
+        }
+        sectionOutput.columns = section.columns.map(column => this.getColumnsInformation(column, isJSONOutput));
+        return sectionOutput;
     }
     /**
      * Publish a modern page in SharePoint Online
@@ -99,5 +103,8 @@ export class Page {
         }
         return pageName;
     }
+    static isVerticalSection(section) {
+        return section.layoutIndex === 2 && section?.controlData?.position?.sectionFactor === 12;
+    }
 }
 //# sourceMappingURL=Page.js.map

package/dist/m365/spo/commands/page/clientsidepages.js

@@ -30,6 +30,10 @@ export var CanvasSectionTemplate;
     /// Vertical
     /// </summary>
     CanvasSectionTemplate[CanvasSectionTemplate["Vertical"] = 6] = "Vertical";
+    /// <summary>
+    /// Flexible
+    /// </summary>
+    CanvasSectionTemplate[CanvasSectionTemplate["Flexible"] = 7] = "Flexible";
 })(CanvasSectionTemplate || (CanvasSectionTemplate = {}));
 /**
  * Section background shading

package/dist/m365/spo/commands/page/page-section-add.js

@@ -22,10 +22,12 @@ class SpoPageSectionAddCommand extends SpoCommand {
     constructor() {
         super();
         _SpoPageSectionAddCommand_instances.add(this);
-        this.sectionTemplate = ['OneColumn', 'OneColumnFullWidth', 'TwoColumn', 'ThreeColumn', 'TwoColumnLeft', 'TwoColumnRight', 'Vertical'];
+        this.sectionTemplate = ['OneColumn', 'OneColumnFullWidth', 'TwoColumn', 'ThreeColumn', 'TwoColumnLeft', 'TwoColumnRight', 'Vertical', 'Flexible'];
         this.zoneEmphasis = ['None', 'Neutral', 'Soft', 'Strong', 'Image', 'Gradient'];
         this.iconAlignment = ['Left', 'Right'];
         this.fillMode = ['ScaleToFill', 'ScaleToFit', 'Tile', 'OriginalSize'];
+        this.zoneReflowStrategy = ['TopToBottom', 'LeftToRight'];
+        this.MINIMUM_ZONE_HEIGHT = 34;
         __classPrivateFieldGet(this, _SpoPageSectionAddCommand_instances, "m", _SpoPageSectionAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoPageSectionAddCommand_instances, "m", _SpoPageSectionAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoPageSectionAddCommand_instances, "m", _SpoPageSectionAddCommand_initValidators).call(this);
@@ -50,6 +52,12 @@ class SpoPageSectionAddCommand extends SpoCommand {
             };
             const res = await request.get(requestOptions);
             canvasContent = JSON.parse(res.CanvasContent1 || "[{\"controlType\":0,\"pageSettingsSlice\":{\"isDefaultDescription\":true,\"isDefaultThumbnail\":true}}]");
+            if (args.options.sectionTemplate === 'OneColumnFullWidth') {
+                this.ensureFullWidthSectionCanBeAdded(canvasContent);
+            }
+            if (args.options.sectionTemplate === 'Vertical') {
+                this.ensureVerticalSectionCanBeAdded(canvasContent);
+            }
             if (!res.IsPageCheckedOutToCurrentUser) {
                 await Page.checkout(pageFullName, args.options.webUrl, logger, this.verbose);
             }
@@ -142,6 +150,9 @@ class SpoPageSectionAddCommand extends SpoCommand {
             case 'Vertical':
                 columns.push(this.getVerticalColumn(args, zoneId));
                 break;
+            case 'Flexible':
+                columns.push(this.getFlexibleColumn(zoneIndex, sectionIndex++, args, zoneId));
+                break;
             case 'OneColumn':
             default:
                 columns.push(this.getColumn(zoneIndex, sectionIndex++, 12, args, zoneId));
@@ -162,9 +173,9 @@ class SpoPageSectionAddCommand extends SpoCommand {
             },
             emphasis: {}
         };
-        if (zoneEmphasis && ['none', 'neutral', 'soft', 'strong'].includes(zoneEmphasis?.toLocaleLowerCase())) {
+        if (zoneEmphasis && ['none', 'neutral', 'soft', 'strong'].includes(zoneEmphasis?.toLowerCase())) {
             // Just these zoneEmphasis values should be added to column emphasis
-            const zoneEmphasisValue = ['none', 'neutral', 'soft', 'strong'].indexOf(zoneEmphasis.toLocaleLowerCase());
+            const zoneEmphasisValue = ['none', 'neutral', 'soft', 'strong'].indexOf(zoneEmphasis.toLowerCase());
             columnValue.emphasis = { zoneEmphasis: zoneEmphasisValue };
         }
         if (isCollapsibleSection) {
@@ -172,8 +183,9 @@ class SpoPageSectionAddCommand extends SpoCommand {
                 type: 1,
                 isExpanded: !!isExpanded,
                 showDividerLine: !!showDivider,
-                iconAlignment: iconAlignment && iconAlignment.toLocaleLowerCase() === "right" ? "right" : "left",
-                displayName: collapsibleTitle
+                iconAlignment: iconAlignment && iconAlignment.toLowerCase() === "right" ? "right" : "left",
+                displayName: collapsibleTitle,
+                headingLevel: args.options.headingLevel ? args.options.headingLevel : 2 //2 is a default heading level
             };
         }
         return columnValue;
@@ -185,6 +197,14 @@ class SpoPageSectionAddCommand extends SpoCommand {
         columnValue.position.controlIndex = 1;
         return columnValue;
     }
+    getFlexibleColumn(zoneIndex, sectionIndex, args, zoneId) {
+        const columnValue = this.getColumn(zoneIndex, sectionIndex, 100, args, zoneId);
+        columnValue.zoneReflowStrategy = { axis: args.options.zoneReflowStrategy ? this.zoneReflowStrategy.indexOf(args.options.zoneReflowStrategy) : 0 };
+        if (args.options.zoneHeight) {
+            columnValue.zoneHeight = args.options.zoneHeight;
+        }
+        return columnValue;
+    }
     setBackgroundControl(zoneId, backgroundControl, args) {
         const { overlayColor, overlayOpacity, useLightText, imageUrl } = args.options;
         const backgroundDetails = this.getBackgroundDetails(args);
@@ -237,6 +257,18 @@ class SpoPageSectionAddCommand extends SpoCommand {
         }
         return backgroundDetails;
     }
+    ensureFullWidthSectionCanBeAdded(canvasContent) {
+        const hasVerticalSection = canvasContent.some((c) => c.position?.layoutIndex === 2 && c.position.sectionFactor === 12);
+        if (hasVerticalSection) {
+            throw "A vertical section already exists on the page. A full-width section cannot be added to a page that already has a vertical section.";
+        }
+    }
+    ensureVerticalSectionCanBeAdded(canvasContent) {
+        const hasFullWidthSection = canvasContent.some((c) => c.position?.layoutIndex === 1 && c.position.sectionFactor === 0);
+        if (hasFullWidthSection) {
+            throw "A full-width section already exists on the page. A vertical section cannot be added to a page that already has a full-width section.";
+        }
+    }
 }
 _SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_initTelemetry = function _SpoPageSectionAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -256,7 +288,10 @@ _SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_i
             useLightText: !!args.options.useLightText,
             overlayColor: typeof args.options.overlayColor !== 'undefined',
             overlayOpacity: typeof args.options.overlayOpacity !== 'undefined',
-            collapsibleTitle: typeof args.options.collapsibleTitle !== 'undefined'
+            collapsibleTitle: typeof args.options.collapsibleTitle !== 'undefined',
+            zoneReflowStrategy: typeof args.options.zoneReflowStrategy !== 'undefined',
+            zoneHeight: typeof args.options.zoneHeight !== 'undefined',
+            headingLevel: typeof args.options.headingLevel !== 'undefined'
         });
     });
 }, _SpoPageSectionAddCommand_initOptions = function _SpoPageSectionAddCommand_initOptions() {
@@ -302,11 +337,18 @@ _SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_i
         option: '--overlayOpacity [overlayOpacity]'
     }, {
         option: '--collapsibleTitle [collapsibleTitle]'
+    }, {
+        option: '--zoneReflowStrategy [zoneReflowStrategy]',
+        autocomplete: this.zoneReflowStrategy
+    }, {
+        option: '--zoneHeight [zoneHeight]'
+    }, {
+        option: '--headingLevel [headingLevel]'
     });
 }, _SpoPageSectionAddCommand_initValidators = function _SpoPageSectionAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!(args.options.sectionTemplate in CanvasSectionTemplate)) {
-            return `${args.options.sectionTemplate} is not a valid section template. Allowed values are OneColumn|OneColumnFullWidth|TwoColumn|ThreeColumn|TwoColumnLeft|TwoColumnRight|Vertical`;
+            return `${args.options.sectionTemplate} is not a valid section template. Allowed values are OneColumn|OneColumnFullWidth|TwoColumn|ThreeColumn|TwoColumnLeft|TwoColumnRight|Vertical|Flexible`;
         }
         if (typeof args.options.order !== 'undefined') {
             if (!Number.isInteger(args.options.order) || args.options.order < 1) {
@@ -314,7 +356,7 @@ _SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_i
             }
         }
         if (typeof args.options.zoneEmphasis !== 'undefined') {
-            if (!this.zoneEmphasis.some(zoneEmphasisValue => zoneEmphasisValue.toLocaleLowerCase() === args.options.zoneEmphasis?.toLowerCase())) {
+            if (!this.zoneEmphasis.some(zoneEmphasisValue => zoneEmphasisValue.toLowerCase() === args.options.zoneEmphasis?.toLowerCase())) {
                 return `The value of parameter zoneEmphasis must be ${this.zoneEmphasis.join(', ')}`;
             }
         }
@@ -324,20 +366,30 @@ _SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_i
             }
         }
         if (typeof args.options.iconAlignment !== 'undefined') {
-            if (!this.iconAlignment.some(iconAlignmentValue => iconAlignmentValue.toLocaleLowerCase() === args.options.iconAlignment?.toLowerCase())) {
+            if (!this.iconAlignment.some(iconAlignmentValue => iconAlignmentValue.toLowerCase() === args.options.iconAlignment?.toLowerCase())) {
                 return `The value of parameter iconAlignment must be ${this.iconAlignment.join(', ')}`;
             }
         }
         if (typeof args.options.fillMode !== 'undefined') {
-            if (!this.fillMode.some(fillModeValue => fillModeValue.toLocaleLowerCase() === args.options.fillMode?.toLowerCase())) {
+            if (!this.fillMode.some(fillModeValue => fillModeValue.toLowerCase() === args.options.fillMode?.toLowerCase())) {
                 return `The value of parameter fillMode must be ${this.fillMode.join(', ')}`;
             }
         }
-        if (args.options.zoneEmphasis?.toLocaleLowerCase() !== 'image' && (args.options.imageUrl || args.options.imageWidth ||
+        if (typeof args.options.zoneReflowStrategy !== 'undefined') {
+            if (!this.zoneReflowStrategy.some(zoneReflowStrategyValue => zoneReflowStrategyValue.toLowerCase() === args.options.zoneReflowStrategy?.toLowerCase())) {
+                return `The value of parameter zoneReflowStrategy must be ${this.zoneReflowStrategy.join(', ')}`;
+            }
+        }
+        if (typeof args.options.headingLevel !== 'undefined') {
+            if (![2, 3, 4].some(headingLevelValue => headingLevelValue === args.options.headingLevel)) {
+                return `The value of parameter headingLevel must be 2, 3 or 4`;
+            }
+        }
+        if (args.options.zoneEmphasis?.toLowerCase() !== 'image' && (args.options.imageUrl || args.options.imageWidth ||
             args.options.imageHeight || args.options.fillMode)) {
             return 'Specify imageUrl, imageWidth, imageHeight or fillMode only when zoneEmphasis is set to Image';
         }
-        if (args.options.zoneEmphasis?.toLocaleLowerCase() === 'image' && !args.options.imageUrl) {
+        if (args.options.zoneEmphasis?.toLowerCase() === 'image' && !args.options.imageUrl) {
             return 'Specify imageUrl when zoneEmphasis is set to Image';
         }
         if (args.options.zoneEmphasis?.toLowerCase() !== 'gradient' && args.options.gradientText) {
@@ -355,10 +407,18 @@ _SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_i
         if (!(args.options.zoneEmphasis && ['image', 'gradient'].includes(args.options.zoneEmphasis.toLowerCase())) && (args.options.overlayColor || args.options.overlayOpacity || args.options.useLightText)) {
             return 'Specify overlayColor or overlayOpacity only when zoneEmphasis is set to Image or Gradient';
         }
+        if (args.options.sectionTemplate?.toLowerCase() !== 'flexible' && (args.options.zoneReflowStrategy || args.options.zoneHeight)) {
+            return 'Specify zoneReflowStrategy or zoneHeight only when sectionTemplate is set to Flexible';
+        }
+        if (typeof args.options.zoneHeight !== 'undefined') {
+            if (!Number.isInteger(args.options.zoneHeight) || args.options.zoneHeight < this.MINIMUM_ZONE_HEIGHT) {
+                return `The value of parameter zoneHeight must be ${this.MINIMUM_ZONE_HEIGHT} or higher`;
+            }
+        }
         return validation.isValidSharePointUrl(args.options.webUrl);
     });
 }, _SpoPageSectionAddCommand_initTypes = function _SpoPageSectionAddCommand_initTypes() {
-    this.types.string = ['pageName', 'webUrl', 'sectionTemplate', 'zoneEmphasis', 'iconAlignment', 'gradientText', 'imageUrl', 'fillMode', 'overlayColor', 'collapsibleTitle'];
+    this.types.string = ['pageName', 'webUrl', 'sectionTemplate', 'zoneEmphasis', 'iconAlignment', 'gradientText', 'imageUrl', 'fillMode', 'overlayColor', 'collapsibleTitle', 'zoneReflowStrategy'];
     this.types.boolean = ['isLayoutReflowOnTop', 'isCollapsibleSection', 'showDivider', 'isExpanded', 'useLightText'];
 };
 export default new SpoPageSectionAddCommand();

package/dist/m365/spo/commands/page/page-section-list.js

@@ -34,10 +34,14 @@ class SpoPageSectionListCommand extends SpoCommand {
                 }
                 else {
                     await logger.log(output.map(s => {
-                        return {
+                        const sectionOutput = {
                             order: s.order,
                             columns: s.columns.length
                         };
+                        if (s.isVertical) {
+                            sectionOutput.isVertical = s.isVertical;
+                        }
+                        return sectionOutput;
                     }));
                 }
             }

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-permissionrequest-list.js

@@ -45,9 +45,6 @@ class SpoServicePrincipalPermissionRequestListCommand extends SpoCommand {
                         }
                     }
                 }
-                if (spoWebAppServicePrincipalPermissionRequestResult.length === 0) {
-                    spoWebAppServicePrincipalPermissionRequestResult = result;
-                }
                 await logger.log(spoWebAppServicePrincipalPermissionRequestResult.map(r => {
                     return {
                         Id: r.Id.replace('/Guid(', '').replace(')/', ''),
@@ -71,14 +68,23 @@ class SpoServicePrincipalPermissionRequestListCommand extends SpoCommand {
             responseType: 'json'
         };
         const response = await request.get(requestOptions);
-        if (response.value && response.value.length > 0) {
-            return response.value[0].scope.split(' ');
+        if (!response.value || response.value.length === 0) {
+            return null;
         }
-        return null;
+        const scopes = [];
+        response.value.forEach(grant => {
+            if (grant.scope) {
+                grant.scope.split(' ')
+                    .map(permission => permission.trim())
+                    .filter(Boolean)
+                    .forEach(permission => scopes.push(permission));
+            }
+        });
+        return scopes;
     }
     async getSPOClientExtensibilityWebApplicationPrincipalId() {
         const requestOptions = {
-            url: `https://graph.microsoft.com/v1.0/servicePrincipals/?$filter=displayName eq 'SharePoint Online Client Extensibility Web Application Principal'`,
+            url: `https://graph.microsoft.com/v1.0/servicePrincipals/?$filter=displayName eq 'SharePoint Online Web Client Extensibility'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },

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

@@ -1,7 +1,15 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import { zod } from '../../../../utils/zod.js';
 import { odata } from '../../../../utils/odata.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+const options = globalOptionsZod
+    .extend({
+    excludeDeletedSites: zod.alias('excludeDeletedSites', z.boolean().optional())
+})
+    .strict();
 class SpoSiteAppCatalogListCommand extends SpoCommand {
     get name() {
         return commands.SITE_APPCATALOG_LIST;
@@ -9,16 +17,44 @@ class SpoSiteAppCatalogListCommand extends SpoCommand {
     get description() {
         return 'List all site collection app catalogs within the tenant';
     }
+    get schema() {
+        return options;
+    }
     defaultProperties() {
         return ['AbsoluteUrl', 'SiteID'];
     }
-    async commandAction(logger) {
+    async commandAction(logger, args) {
         try {
             if (this.verbose) {
                 await logger.logToStderr('Retrieving site collection app catalogs...');
             }
             const spoUrl = await spo.getSpoUrl(logger, this.debug);
-            const appCatalogs = await odata.getAllItems(`${spoUrl}/_api/Web/TenantAppCatalog/SiteCollectionAppCatalogsSites`);
+            let appCatalogs = await odata.getAllItems(`${spoUrl}/_api/Web/TenantAppCatalog/SiteCollectionAppCatalogsSites`);
+            if (args.options.excludeDeletedSites) {
+                if (this.verbose) {
+                    await logger.logToStderr('Excluding inaccessible sites from the results...');
+                }
+                const activeAppCatalogs = [];
+                for (const appCatalog of appCatalogs) {
+                    try {
+                        await spo.getWeb(appCatalog.AbsoluteUrl, logger, this.verbose);
+                        activeAppCatalogs.push(appCatalog);
+                    }
+                    catch (error) {
+                        if (this.debug) {
+                            await logger.logToStderr(error);
+                        }
+                        if (error.status === 404 || error.status === 403) {
+                            if (this.verbose) {
+                                await logger.logToStderr(`Site at '${appCatalog.AbsoluteUrl}' is inaccessible. Excluding from results...`);
+                            }
+                            continue;
+                        }
+                        throw error;
+                    }
+                }
+                appCatalogs = activeAppCatalogs;
+            }
             await logger.log(appCatalogs);
         }
         catch (err) {

package/dist/m365/spo/commands/tenant/tenant-site-unarchive.js

@@ -31,7 +31,7 @@ class SpoTenantSiteUnarchiveCommand extends SpoCommand {
             await this.unarchiveSite(logger, args.options.url);
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to unarchive site '${args.options.url}'? This may cause additional billing costs.` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to unarchive site '${args.options.url}'? You won't be able to rearchive this site for 120 days.` });
             if (result) {
                 await this.unarchiveSite(logger, args.options.url);
             }