@pnp/cli-microsoft365 7.0.0-beta.093ef31 → 7.0.0-beta.14c7857

package/dist/m365/spo/commands/hubsite/hubsite-connect.js

@@ -9,6 +9,8 @@ import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
+import { formatting } from '../../../../utils/formatting.js';
 class SpoHubSiteConnectCommand extends SpoCommand {
     get name() {
         return commands.HUBSITE_CONNECT;
@@ -31,8 +33,8 @@ class SpoHubSiteConnectCommand extends SpoCommand {
         try {
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             const hubSites = await this.getHubSites(spoAdminUrl);
-            const hubSite = this.getSpecificHubSite(hubSites, args.options.id, args.options.title, args.options.url);
-            const parentHubSite = this.getSpecificHubSite(hubSites, args.options.parentId, args.options.parentTitle, args.options.parentUrl);
+            const hubSite = await this.getSpecificHubSite(hubSites, args.options.id, args.options.title, args.options.url);
+            const parentHubSite = await this.getSpecificHubSite(hubSites, args.options.parentId, args.options.parentTitle, args.options.parentUrl);
             const requestOptions = {
                 url: `${spoAdminUrl}/_api/HubSites/GetById('${hubSite.ID}')`,
                 headers: {
@@ -61,7 +63,7 @@ class SpoHubSiteConnectCommand extends SpoCommand {
         const hubSites = await request.get(requestOptions);
         return hubSites.value;
     }
-    getSpecificHubSite(hubSites, id, title, url) {
+    async getSpecificHubSite(hubSites, id, title, url) {
         let filteredHubSites = [];
         if (id) {
             filteredHubSites = hubSites.filter(site => site.ID.toLowerCase() === id.toLowerCase());
@@ -76,7 +78,8 @@ class SpoHubSiteConnectCommand extends SpoCommand {
             throw `The specified hub site '${id || title || url}' does not exist.`;
         }
         if (filteredHubSites.length > 1) {
-            throw `Multiple hub sites with name '${title}' found: ${filteredHubSites.map(s => s.ID).join(',')}.`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('ID', filteredHubSites);
+            return await Cli.handleMultipleResultsFound(`Multiple hub sites with name '${title}' found.`, resultAsKeyValuePair);
         }
         return filteredHubSites[0];
     }

package/dist/m365/spo/commands/hubsite/hubsite-disconnect.js

@@ -6,6 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoHubSiteDisconnectCommand_instances, _SpoHubSiteDisconnectCommand_initTelemetry, _SpoHubSiteDisconnectCommand_initOptions, _SpoHubSiteDisconnectCommand_initOptionSets, _SpoHubSiteDisconnectCommand_initValidators;
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -91,7 +92,9 @@ class SpoHubSiteDisconnectCommand extends SpoCommand {
             throw `The specified hub site '${options.title || options.url}' does not exist.`;
         }
         if (filteredHubSites.length > 1) {
-            throw `Multiple hub sites with name '${options.title}' found: ${filteredHubSites.map(s => s.ID).join(',')}.`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('ID', filteredHubSites);
+            const result = await Cli.handleMultipleResultsFound(`Multiple hub sites with name '${options.title}' found.`, resultAsKeyValuePair);
+            return result;
         }
         return filteredHubSites[0];
     }

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

@@ -6,6 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoHubSiteGetCommand_instances, _SpoHubSiteGetCommand_initTelemetry, _SpoHubSiteGetCommand_initOptions, _SpoHubSiteGetCommand_initValidators, _SpoHubSiteGetCommand_initOptionSets;
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -87,7 +88,8 @@ class SpoHubSiteGetCommand extends SpoCommand {
             throw `The specified hub site ${options.title || options.url} does not exist`;
         }
         if (hubSites.length > 1) {
-            throw `Multiple hub sites with ${options.title || options.url} found. Please disambiguate: ${hubSites.map(site => site.SiteUrl).join(', ')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('ID', hubSites);
+            return await Cli.handleMultipleResultsFound(`Multiple hub sites with ${options.title || options.url} found.`, resultAsKeyValuePair);
         }
         return hubSites[0];
     }

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

@@ -148,6 +148,7 @@ class SpoListItemAddCommand extends SpoCommand {
                 responseType: 'json'
             };
             const item = await request.get(requestOptions);
+            delete item.ID;
             await logger.log(item);
         }
         catch (err) {

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

@@ -188,8 +188,9 @@ class SpoListItemSetCommand extends SpoCommand {
                 },
                 responseType: 'json'
             };
-            const itemsResponse = await request.get(requestOptionsItems);
-            await logger.log(itemsResponse);
+            const item = await request.get(requestOptionsItems);
+            delete item.ID;
+            await logger.log(item);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -26,7 +26,25 @@ export var CanvasSectionTemplate;
     /// Two columns, left one is 1/3, right one 2/3
     /// </summary>
     CanvasSectionTemplate[CanvasSectionTemplate["TwoColumnRight"] = 5] = "TwoColumnRight";
+    /// <summary>
+    /// Vertical
+    /// </summary>
+    CanvasSectionTemplate[CanvasSectionTemplate["Vertical"] = 6] = "Vertical";
 })(CanvasSectionTemplate || (CanvasSectionTemplate = {}));
+/**
+ * Section background shading
+ * 0 - None
+ * 1 - Neutral
+ * 2 - Soft
+ * 3 - Strong
+ */
+export var ZoneEmphasis;
+(function (ZoneEmphasis) {
+    ZoneEmphasis[ZoneEmphasis["None"] = 0] = "None";
+    ZoneEmphasis[ZoneEmphasis["Neutral"] = 1] = "Neutral";
+    ZoneEmphasis[ZoneEmphasis["Soft"] = 2] = "Soft";
+    ZoneEmphasis[ZoneEmphasis["Strong"] = 3] = "Strong";
+})(ZoneEmphasis || (ZoneEmphasis = {}));
 /**
  * Shorthand for Object.hasOwnProperty
  *

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

@@ -72,6 +72,7 @@ class SpoPageGetCommand extends SpoCommand {
                     pageItemData.numSections = sections.length;
                 }
             }
+            delete pageItemData.ListItemAllFields.ID;
             await logger.log(pageItemData);
         }
         catch (err) {

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

@@ -34,9 +34,9 @@ class SpoPageListCommand extends SpoCommand {
             if (pagesList && pagesList.length > 0) {
                 pages = pagesList;
             }
-            const res = await odata.getAllItems(`${args.options.webUrl}/_api/web/lists/SitePages/rootfolder/files?$expand=ListItemAllFields/ClientSideApplicationId&$orderby=Name`);
-            if (res && res.length > 0) {
-                const clientSidePages = res.filter(p => p.ListItemAllFields.ClientSideApplicationId === 'b6917cb1-93a0-4b97-a84d-7cf49975d4ec');
+            const files = await odata.getAllItems(`${args.options.webUrl}/_api/web/lists/SitePages/rootfolder/files?$expand=ListItemAllFields/ClientSideApplicationId&$orderby=Name`);
+            if (files?.length > 0) {
+                const clientSidePages = files.filter(f => f.ListItemAllFields.ClientSideApplicationId === 'b6917cb1-93a0-4b97-a84d-7cf49975d4ec');
                 pages = pages.map(p => {
                     const clientSidePage = clientSidePages.find(cp => cp && cp.ListItemAllFields && cp.ListItemAllFields.Id === p.Id);
                     if (clientSidePage) {
@@ -47,6 +47,7 @@ class SpoPageListCommand extends SpoCommand {
                     }
                     return p;
                 });
+                pages.filter(p => p.ListItemAllFields).forEach(page => delete page.ListItemAllFields.ID);
                 await logger.log(pages);
             }
         }

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

@@ -3,13 +3,13 @@ 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 _SpoPageSectionAddCommand_instances, _SpoPageSectionAddCommand_initTelemetry, _SpoPageSectionAddCommand_initOptions, _SpoPageSectionAddCommand_initValidators;
+var _SpoPageSectionAddCommand_instances, _a, _SpoPageSectionAddCommand_initTelemetry, _SpoPageSectionAddCommand_initOptions, _SpoPageSectionAddCommand_initValidators;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import { CanvasSectionTemplate } from './clientsidepages.js';
+import { CanvasSectionTemplate, ZoneEmphasis } from './clientsidepages.js';
 class SpoPageSectionAddCommand extends SpoCommand {
     get name() {
         return commands.PAGE_SECTION_ADD;
@@ -67,7 +67,7 @@ class SpoPageSectionAddCommand extends SpoCommand {
             // zoneIndex for the new section to add
             const zoneIndex = this.getSectionIndex(zoneIndices, args.options.order);
             // get the list of columns to insert based on the selected template
-            const columnsToAdd = this.getColumns(zoneIndex, args.options.sectionTemplate);
+            const columnsToAdd = this.getColumns(zoneIndex, args.options.sectionTemplate, args.options.zoneEmphasis, args.options.isLayoutReflowOnTop);
             // insert the column in the right place in the array so that
             // it stays sorted ascending by zoneIndex
             let pos = canvasContent.findIndex(c => typeof c.controlType === 'undefined' && c.position.zoneIndex > zoneIndex);
@@ -107,39 +107,42 @@ class SpoPageSectionAddCommand extends SpoCommand {
         }
         return zoneIndices[order - 2] + ((zoneIndices[order - 1] - zoneIndices[order - 2]) / 2);
     }
-    getColumns(zoneIndex, sectionTemplate) {
+    getColumns(zoneIndex, sectionTemplate, zoneEmphasis, isLayoutReflowOnTop) {
         const columns = [];
         let sectionIndex = 1;
         switch (sectionTemplate) {
             case 'OneColumnFullWidth':
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 0));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 0, zoneEmphasis));
                 break;
             case 'TwoColumn':
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 6));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 6));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 6, zoneEmphasis));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 6, zoneEmphasis));
                 break;
             case 'ThreeColumn':
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, zoneEmphasis));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, zoneEmphasis));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, zoneEmphasis));
                 break;
             case 'TwoColumnLeft':
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 8));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 8, zoneEmphasis));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, zoneEmphasis));
                 break;
             case 'TwoColumnRight':
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 8));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, zoneEmphasis));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 8, zoneEmphasis));
+                break;
+            case 'Vertical':
+                columns.push(this.getVerticalColumn(zoneEmphasis, isLayoutReflowOnTop));
                 break;
             case 'OneColumn':
             default:
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 12));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 12, zoneEmphasis));
                 break;
         }
         return columns;
     }
-    getColumn(zoneIndex, sectionIndex, sectionFactor) {
-        return {
+    getColumn(zoneIndex, sectionIndex, sectionFactor, zoneEmphasis) {
+        const columnValue = {
             displayMode: 2,
             position: {
                 zoneIndex: zoneIndex,
@@ -149,12 +152,26 @@ class SpoPageSectionAddCommand extends SpoCommand {
             },
             emphasis: {}
         };
+        if (zoneEmphasis) {
+            const zoneEmphasisValue = ZoneEmphasis[zoneEmphasis];
+            columnValue.emphasis = { zoneEmphasis: zoneEmphasisValue };
+        }
+        return columnValue;
+    }
+    getVerticalColumn(zoneEmphasis, isLayoutReflowOnTop) {
+        const columnValue = this.getColumn(1, 1, 12, zoneEmphasis);
+        columnValue.position.isLayoutReflowOnTop = isLayoutReflowOnTop !== undefined ? true : false;
+        columnValue.position.layoutIndex = 2;
+        columnValue.position.controlIndex = 1;
+        return columnValue;
     }
 }
-_SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_initTelemetry = function _SpoPageSectionAddCommand_initTelemetry() {
+_a = SpoPageSectionAddCommand, _SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_initTelemetry = function _SpoPageSectionAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            order: typeof args.options.order !== 'undefined'
+            order: typeof args.options.order !== 'undefined',
+            zoneEmphasis: typeof args.options.zoneEmphasis !== 'undefined',
+            isLayoutReflowOnTop: !!args.options.isLayoutReflowOnTop
         });
     });
 }, _SpoPageSectionAddCommand_initOptions = function _SpoPageSectionAddCommand_initOptions() {
@@ -163,22 +180,40 @@ _SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_i
     }, {
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-t, --sectionTemplate <sectionTemplate>'
+        option: '-t, --sectionTemplate <sectionTemplate>',
+        autocomplete: _a.SectionTemplate
     }, {
         option: '--order [order]'
+    }, {
+        option: '--zoneEmphasis [zoneEmphasis]',
+        autocomplete: _a.ZoneEmphasis
+    }, {
+        option: '--isLayoutReflowOnTop'
     });
 }, _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`;
+            return `${args.options.sectionTemplate} is not a valid section template. Allowed values are OneColumn|OneColumnFullWidth|TwoColumn|ThreeColumn|TwoColumnLeft|TwoColumnRight|Vertical`;
         }
         if (typeof args.options.order !== 'undefined') {
             if (!Number.isInteger(args.options.order) || args.options.order < 1) {
                 return 'The value of parameter order must be 1 or higher';
             }
         }
+        if (typeof args.options.zoneEmphasis !== 'undefined') {
+            if (!(args.options.zoneEmphasis in ZoneEmphasis)) {
+                return 'The value of parameter zoneEmphasis must be None|Neutral|Soft|Strong';
+            }
+        }
+        if (typeof args.options.isLayoutReflowOnTop !== 'undefined') {
+            if (args.options.sectionTemplate !== 'Vertical') {
+                return 'Specify isLayoutReflowOnTop when the sectionTemplate is set to Vertical.';
+            }
+        }
         return validation.isValidSharePointUrl(args.options.webUrl);
     });
 };
+SpoPageSectionAddCommand.SectionTemplate = ['OneColumn', 'OneColumnFullWidth', 'TwoColumn', 'ThreeColumn', 'TwoColumnLeft', 'TwoColumnRight', 'Vertical'];
+SpoPageSectionAddCommand.ZoneEmphasis = ['None', 'Neutral', 'Soft', 'Strong'];
 export default new SpoPageSectionAddCommand();
 //# sourceMappingURL=page-section-add.js.map

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

@@ -58,7 +58,7 @@ class SpoPageSetCommand extends SpoCommand {
                 pageTitle = pageTitle || page.Title;
                 pageId = page.Id;
                 bannerImageUrl = page.BannerImageUrl;
-                canvasContent1 = page.CanvasContent1;
+                canvasContent1 = args.options.content || page.CanvasContent1;
                 layoutWebpartsContent = page.LayoutWebpartsContent;
                 pageDescription = pageDescription || page.Description;
                 topicHeader = page.TopicHeader;
@@ -277,7 +277,8 @@ _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry =
             publish: args.options.publish || false,
             publishMessage: typeof args.options.publishMessage !== 'undefined',
             description: typeof args.options.description !== 'undefined',
-            title: typeof args.options.title !== 'undefined'
+            title: typeof args.options.title !== 'undefined',
+            content: typeof args.options.content !== 'undefined'
         });
     });
 }, _SpoPageSetCommand_initOptions = function _SpoPageSetCommand_initOptions() {
@@ -305,6 +306,8 @@ _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry =
         option: '--description [description]'
     }, {
         option: '--title [title]'
+    }, {
+        option: '--content [content]'
     });
 }, _SpoPageSetCommand_initTypes = function _SpoPageSetCommand_initTypes() {
     this.types.boolean.push('commentsEnabled');
@@ -332,6 +335,14 @@ _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry =
         if (args.options.promoteAs === 'NewsPage' && args.options.layoutType && args.options.layoutType !== 'Article') {
             return 'You can only promote article pages as news article';
         }
+        if (args.options.content) {
+            try {
+                JSON.parse(args.options.content);
+            }
+            catch (e) {
+                return `Specified content is not a valid JSON string. Input: ${args.options.content}. Error: ${e}`;
+            }
+        }
         return true;
     });
 };

package/dist/m365/spo/commands/site/site-commsite-enable.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 _SpoSiteCommSiteEnableCommand_instances, _SpoSiteCommSiteEnableCommand_initTelemetry, _SpoSiteCommSiteEnableCommand_initOptions, _SpoSiteCommSiteEnableCommand_initValidators;
+var _SpoSiteCommSiteEnableCommand_instances, _SpoSiteCommSiteEnableCommand_initTelemetry, _SpoSiteCommSiteEnableCommand_initOptions, _SpoSiteCommSiteEnableCommand_initOptionSets, _SpoSiteCommSiteEnableCommand_initValidators;
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -21,11 +21,12 @@ class SpoSiteCommSiteEnableCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoSiteCommSiteEnableCommand_instances, "m", _SpoSiteCommSiteEnableCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoSiteCommSiteEnableCommand_instances, "m", _SpoSiteCommSiteEnableCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteCommSiteEnableCommand_instances, "m", _SpoSiteCommSiteEnableCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteCommSiteEnableCommand_instances, "m", _SpoSiteCommSiteEnableCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        const designPackageId = args.options.designPackageId || '96c933ac-3698-44c7-9f4a-5fd17d71af9e';
+        const designPackageId = this.getDesignPackageId(args.options);
         if (this.verbose) {
-            logger.logToStderr(`Enabling communication site at ${args.options.url}...`);
+            logger.logToStderr(`Enabling communication site with design package '${designPackageId}' at '${args.options.url}'...`);
         }
         try {
             const requestOptions = {
@@ -42,11 +43,26 @@ class SpoSiteCommSiteEnableCommand extends SpoCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    getDesignPackageId(options) {
+        if (options.designPackageId) {
+            return options.designPackageId;
+        }
+        switch (options.designPackage) {
+            case 'Blank':
+                return 'f6cc5403-0d63-442e-96c0-285923709ffc';
+            case 'Showcase':
+                return '6142d2a0-63a5-4ba0-aede-d9fefca2c767';
+            case 'Topic':
+            default:
+                return '96c933ac-3698-44c7-9f4a-5fd17d71af9e';
+        }
+    }
 }
 _SpoSiteCommSiteEnableCommand_instances = new WeakSet(), _SpoSiteCommSiteEnableCommand_initTelemetry = function _SpoSiteCommSiteEnableCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            designPackageId: typeof args.options.designPackageId !== 'undefined'
+            designPackageId: typeof args.options.designPackageId !== 'undefined',
+            designPackage: typeof args.options.designPackage !== 'undefined'
         });
     });
 }, _SpoSiteCommSiteEnableCommand_initOptions = function _SpoSiteCommSiteEnableCommand_initOptions() {
@@ -54,12 +70,25 @@ _SpoSiteCommSiteEnableCommand_instances = new WeakSet(), _SpoSiteCommSiteEnableC
         option: '-u, --url <url>'
     }, {
         option: '-i, --designPackageId [designPackageId]'
+    }, {
+        option: '-p, --designPackage [designPackage]',
+        autocomplete: ["Topic", "Showcase", "Blank"]
+    });
+}, _SpoSiteCommSiteEnableCommand_initOptionSets = function _SpoSiteCommSiteEnableCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['designPackageId', 'designPackage'],
+        runsWhen: (args) => args.options.designPackageId || args.options.designPackage
     });
 }, _SpoSiteCommSiteEnableCommand_initValidators = function _SpoSiteCommSiteEnableCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.designPackageId &&
             !validation.isValidGuid(args.options.designPackageId)) {
-            return `${args.options.designPackageId} is not a valid GUID`;
+            return `${args.options.designPackageId} is not a valid GUID.`;
+        }
+        if (args.options.designPackage) {
+            if (['Topic', 'Showcase', 'Blank'].indexOf(args.options.designPackage) === -1) {
+                return `${args.options.designPackage} is not a valid designPackage. Allowed values are Topic|Showcase|Blank`;
+            }
         }
         return validation.isValidSharePointUrl(args.options.url);
     });

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

@@ -54,16 +54,14 @@ class SpoSiteListCommand extends SpoCommand {
             },
             data: requestBody
         };
-        const res1 = await request.post(requestOptions);
-        const json = JSON.parse(res1);
-        const response = json[0];
-        logger.log(response);
-        if (response.ErrorInfo) {
-            throw response.ErrorInfo.ErrorMessage;
+        const response = await request.post(requestOptions);
+        const json = JSON.parse(response);
+        const responseContent = json[0];
+        if (responseContent.ErrorInfo) {
+            throw responseContent.ErrorInfo.ErrorMessage;
         }
         else {
             const sites = json[json.length - 1];
-            logger.log(sites);
             this.allSites.push(...sites._Child_Items_);
             if (sites.NextStartIndexFromSharePoint) {
                 await this.getAllSites(spoAdminUrl, filter, sites.NextStartIndexFromSharePoint, personalSite, webTemplate, formDigest, logger);

package/dist/m365/spo/commands/tenant/tenant-appcatalog-add.js

@@ -75,7 +75,7 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand {
                 url: url,
                 skipRecycleBin: true,
                 wait: true,
-                confirm: true,
+                force: true,
                 verbose: this.verbose,
                 debug: this.debug
             };

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-get.js

@@ -11,6 +11,7 @@ import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
 class SpoTenantApplicationCustomizerGetCommand extends SpoCommand {
     get name() {
         return commands.TENANT_APPLICATIONCUSTOMIZER_GET;
@@ -48,11 +49,15 @@ class SpoTenantApplicationCustomizerGetCommand extends SpoCommand {
                 if (listItemInstances.length === 0) {
                     throw 'The specified application customizer was not found';
                 }
+                listItemInstances.forEach(v => delete v['ID']);
                 if (listItemInstances.length > 1) {
-                    throw `Multiple application customizers with ${args.options.title || args.options.clientSideComponentId} were found. Please disambiguate (IDs): ${listItemInstances.map(item => item.GUID).join(', ')}`;
+                    const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', listItemInstances);
+                    const result = await Cli.handleMultipleResultsFound(`Multiple application customizers with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
+                    await logger.log(result);
+                }
+                else {
+                    await logger.log(listItemInstances[0]);
                 }
-                listItemInstances.forEach(v => delete v['ID']);
-                await logger.log(listItemInstances[0]);
             }
             else {
                 throw 'The specified application customizer was not found';

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-list.js

@@ -22,8 +22,9 @@ class SpoTenantApplicationCustomizerListCommand extends SpoCommand {
         }
         const listServerRelativeUrl = urlUtil.getServerRelativePath(appCatalogUrl, '/lists/TenantWideExtensions');
         try {
-            const response = await odata.getAllItems(`${appCatalogUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')/items?$filter=TenantWideExtensionLocation eq 'ClientSideExtension.ApplicationCustomizer'`);
-            await logger.log(response);
+            const listItems = await odata.getAllItems(`${appCatalogUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')/items?$filter=TenantWideExtensionLocation eq 'ClientSideExtension.ApplicationCustomizer'`);
+            listItems.forEach(i => delete i.ID);
+            await logger.log(listItems);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-remove.js

@@ -66,7 +66,8 @@ class SpoTenantApplicationCustomizerRemoveCommand extends SpoCommand {
             throw 'The specified application customizer was not found';
         }
         if (listItemInstances.length > 1) {
-            throw `Multiple application customizers with ${args.options.title || args.options.clientSideComponentId} were found. Please disambiguate (IDs): ${listItemInstances.map(item => item.Id).join(', ')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', listItemInstances);
+            listItemInstances[0] = await Cli.handleMultipleResultsFound(`Multiple application customizers with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
         }
         return listItemInstances[0].Id;
     }

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-set.js

@@ -4,7 +4,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoTenantApplicationCustomizerSetCommand_instances, _SpoTenantApplicationCustomizerSetCommand_initTelemetry, _SpoTenantApplicationCustomizerSetCommand_initOptions, _SpoTenantApplicationCustomizerSetCommand_initValidators, _SpoTenantApplicationCustomizerSetCommand_initOptionSets;
-import os from 'os';
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -69,7 +68,9 @@ class SpoTenantApplicationCustomizerSetCommand extends SpoCommand {
             throw 'The specified application customizer was not found';
         }
         if (listItemInstances.length > 1) {
-            throw `Multiple application customizers with ${title ? `title '${title}'` : `ClientSideComponentId '${clientSideComponentId}'`} found. Please disambiguate using IDs: ${os.EOL}${listItemInstances.map(item => `- ${item.Id}`).join(os.EOL)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', listItemInstances);
+            const result = await Cli.handleMultipleResultsFound(`Multiple application customizers with ${title ? `title '${title}'` : `ClientSideComponentId '${clientSideComponentId}'`} found.`, resultAsKeyValuePair);
+            return result.Id;
         }
         return listItemInstances[0].Id;
     }

package/dist/m365/spo/commands/tenant/tenant-commandset-get.js

@@ -4,6 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoTenantCommandSetGetCommand_instances, _SpoTenantCommandSetGetCommand_initTelemetry, _SpoTenantCommandSetGetCommand_initOptions, _SpoTenantCommandSetGetCommand_initValidators, _SpoTenantCommandSetGetCommand_initOptionSets;
+import { Cli } from '../../../../cli/Cli.js';
 import { CommandError } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -53,11 +54,15 @@ class SpoTenantCommandSetGetCommand extends SpoCommand {
         try {
             const listItemInstances = await request.get(reqOptions);
             if (listItemInstances?.value.length > 0) {
+                listItemInstances.value.forEach(v => delete v['ID']);
                 if (listItemInstances.value.length > 1) {
-                    throw `Multiple ListView Command Sets with ${args.options.title || args.options.clientSideComponentId} were found. Please disambiguate (IDs): ${listItemInstances.value.map(item => item.Id).join(', ')}`;
+                    const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', listItemInstances.value);
+                    const result = await Cli.handleMultipleResultsFound(`Multiple ListView Command Sets with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
+                    await logger.log(result);
+                }
+                else {
+                    await logger.log(listItemInstances.value[0]);
                 }
-                listItemInstances.value.forEach(v => delete v['ID']);
-                await logger.log(listItemInstances.value[0]);
             }
             else {
                 throw 'The specified ListView Command Set was not found';

package/dist/m365/spo/commands/tenant/tenant-commandset-list.js

@@ -25,8 +25,9 @@ class SpoTenantCommandSetListCommand extends SpoCommand {
         }
         const listServerRelativeUrl = urlUtil.getServerRelativePath(appCatalogUrl, '/lists/TenantWideExtensions');
         try {
-            const response = await odata.getAllItems(`${appCatalogUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')/items?$filter=startswith(TenantWideExtensionLocation, 'ClientSideExtension.ListViewCommandSet')`);
-            await logger.log(response);
+            const listItems = await odata.getAllItems(`${appCatalogUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')/items?$filter=startswith(TenantWideExtensionLocation, 'ClientSideExtension.ListViewCommandSet')`);
+            listItems.forEach(i => delete i.ID);
+            await logger.log(listItems);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/spo/commands/tenant/tenant-commandset-remove.js

@@ -90,7 +90,9 @@ class SpoTenantCommandSetRemoveCommand extends SpoCommand {
             throw 'The specified command set was not found';
         }
         if (listItemInstances.length > 1) {
-            throw `Multiple command sets with ${args.options.title || args.options.clientSideComponentId} were found. Please disambiguate (IDs): ${listItemInstances.map(item => item.Id).join(', ')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', listItemInstances);
+            const result = await Cli.handleMultipleResultsFound(`Multiple command sets with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
+            return result.Id;
         }
         return listItemInstances[0].Id;
     }

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

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoTermGetCommand_instances, _SpoTermGetCommand_initTelemetry, _SpoTermGetCommand_initOptions, _SpoTermGetCommand_initValidators, _SpoTermGetCommand_initOptionSets;
-import os from 'os';
+import { Cli } from '../../../../cli/Cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -52,12 +52,12 @@ class SpoTermGetCommand extends SpoCommand {
                     throw `Term with name '${args.options.name}' could not be found.`;
                 }
                 if (terms._Child_Items_.length > 1) {
-                    const disambiguationText = terms._Child_Items_.map(c => {
-                        return `- ${this.getTermId(c.Id)} - ${c.PathOfTerm}`;
-                    }).join(os.EOL);
-                    throw new Error(`Multiple terms with the specific term name found. Please disambiguate:${os.EOL}${disambiguationText}`);
+                    const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', terms._Child_Items_);
+                    term = await Cli.handleMultipleResultsFound(`Multiple terms with the specific term name found.`, resultAsKeyValuePair);
+                }
+                else {
+                    term = terms._Child_Items_[0];
                 }
-                term = terms._Child_Items_[0];
             }
             else {
                 term = csomResponse;