@pnp/cli-microsoft365 10.9.0-beta.bc13e90 → 10.10.0-beta.3dc1bcf

package/dist/m365/spo/commands/contenttype/contenttype-field-set.js

@@ -102,32 +102,10 @@ class SpoContentTypeFieldSetCommand extends SpoCommand {
                 throw 'DONE';
             }
             if (!this.siteId) {
-                if (this.verbose) {
-                    await logger.logToStderr(`Retrieving site collection id...`);
-                }
-                requestOptions = {
-                    url: `${args.options.webUrl}/_api/site?$select=Id`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                const site = await request.get(requestOptions);
-                this.siteId = site.Id;
+                this.siteId = await spo.getSiteIdBySPApi(args.options.webUrl, logger, this.verbose);
             }
             if (!this.webId) {
-                if (this.verbose) {
-                    await logger.logToStderr(`Retrieving site id...`);
-                }
-                requestOptions = {
-                    url: `${args.options.webUrl}/_api/web?$select=Id`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                const web = await request.get(requestOptions);
-                this.webId = web.Id;
+                this.webId = await spo.getWebId(args.options.webUrl, logger, this.verbose);
             }
             if (this.verbose) {
                 await logger.logToStderr(`Updating field link...`);
@@ -172,30 +150,8 @@ class SpoContentTypeFieldSetCommand extends SpoCommand {
             }
         }
         await this.updateField(xField, requiresUpdate, logger, args);
-        if (this.verbose) {
-            await logger.logToStderr(`Retrieving site collection id...`);
-        }
-        const requestOptionsSiteId = {
-            url: `${args.options.webUrl}/_api/site?$select=Id`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        const resSiteId = await request.get(requestOptionsSiteId);
-        this.siteId = resSiteId.Id;
-        if (this.verbose) {
-            await logger.logToStderr(`Retrieving site id...`);
-        }
-        const requestOptionsWebId = {
-            url: `${args.options.webUrl}/_api/web?$select=Id`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        const resWebId = await request.get(requestOptionsWebId);
-        this.webId = resWebId.Id;
+        this.siteId = await spo.getSiteIdBySPApi(args.options.webUrl, logger, this.verbose);
+        this.webId = await spo.getWebId(args.options.webUrl, logger, this.verbose);
         await this.ensureRequestDigest(args.options.webUrl, logger);
         const requestOptions = {
             url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,

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

@@ -7,6 +7,7 @@ var _SpoContentTypeSetCommand_instances, _SpoContentTypeSetCommand_initTelemetry
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -33,8 +34,8 @@ class SpoContentTypeSetCommand extends SpoCommand {
     async commandAction(logger, args) {
         try {
             const contentTypeId = await this.getContentTypeId(logger, args.options);
-            const siteId = await this.getSiteId(logger, args.options.webUrl);
-            const webId = await this.getWebId(logger, args.options.webUrl);
+            const siteId = await spo.getSiteIdBySPApi(args.options.webUrl, logger, this.verbose);
+            const webId = await spo.getWebId(args.options.webUrl, logger, this.verbose);
             await this.updateContentType(logger, siteId, webId, contentTypeId, args.options);
         }
         catch (err) {
@@ -80,7 +81,7 @@ class SpoContentTypeSetCommand extends SpoCommand {
             headers: {
                 'Content-Type': 'text/xml'
             },
-            data: await this.getCsomCallXmlBody(options, siteId, webId, contentTypeId)
+            data: await this.getCsomCallXmlBody(options, siteId, webId, contentTypeId, logger)
         };
         const res = await request.post(requestOptions);
         const json = JSON.parse(res);
@@ -89,9 +90,9 @@ class SpoContentTypeSetCommand extends SpoCommand {
             throw response.ErrorInfo.ErrorMessage;
         }
     }
-    async getCsomCallXmlBody(options, siteId, webId, contentTypeId) {
+    async getCsomCallXmlBody(options, siteId, webId, contentTypeId, logger) {
         const payload = this.getRequestPayload(options);
-        const list = await this.getListId(options);
+        const list = await this.getListId(options, logger);
         return `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions>${payload}</Actions><ObjectPaths><Identity Id="9" Name="fc4179a0-e0d7-5000-c38b-bc3506fbab6f|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}${list}:contenttype:${formatting.escapeXml(contentTypeId)}" /></ObjectPaths></Request>`;
     }
     getRequestPayload(options) {
@@ -122,35 +123,7 @@ class SpoContentTypeSetCommand extends SpoCommand {
         }
         return payload.join('');
     }
-    async getSiteId(logger, webUrl) {
-        if (this.verbose) {
-            await logger.logToStderr(`Retrieving site collection id...`);
-        }
-        const requestOptions = {
-            url: `${webUrl}/_api/site?$select=Id`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        const site = await request.get(requestOptions);
-        return site.Id;
-    }
-    async getWebId(logger, webUrl) {
-        if (this.verbose) {
-            await logger.logToStderr(`Retrieving web id...`);
-        }
-        const requestOptions = {
-            url: `${webUrl}/_api/web?$select=Id`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        const web = await request.get(requestOptions);
-        return web.Id;
-    }
-    async getListId(options) {
+    async getListId(options, logger) {
         if (!options.listId && !options.listTitle && !options.listUrl) {
             return '';
         }
@@ -158,30 +131,7 @@ class SpoContentTypeSetCommand extends SpoCommand {
         if (options.listId) {
             return baseString += options.listId;
         }
-        else if (options.listTitle) {
-            const requestOptions = {
-                url: `${options.webUrl}/_api/web/lists/getByTitle('${formatting.encodeQueryParameter(options.listTitle)}')?$select=Id`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            const listResponse = await request.get(requestOptions);
-            baseString += listResponse.Id;
-        }
-        else if (options.listUrl) {
-            const listServerRelativeUrl = urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
-            const requestOptions = {
-                url: `${options.webUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')?$select=Id`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            const listResponse = await request.get(requestOptions);
-            baseString += listResponse.Id;
-        }
-        return baseString;
+        return baseString += await spo.getListId(options.webUrl, options.listTitle, options.listUrl, logger, this.verbose);
     }
 }
 _SpoContentTypeSetCommand_instances = new WeakSet(), _SpoContentTypeSetCommand_initTelemetry = function _SpoContentTypeSetCommand_initTelemetry() {

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

@@ -33,7 +33,7 @@ class SpoContentTypeSyncCommand extends SpoCommand {
         const url = new URL(webUrl);
         const baseUrl = 'https://graph.microsoft.com/v1.0/sites/';
         try {
-            const siteUrl = url.pathname === '/' ? url.host : await spo.getSiteId(webUrl, logger, this.verbose);
+            const siteUrl = url.pathname === '/' ? url.host : await spo.getSiteIdByMSGraph(webUrl, logger, this.verbose);
             const listPath = listId || listTitle || listUrl ? `/lists/${listId || listTitle || await this.getListIdByUrl(webUrl, listUrl, logger)}` : '';
             const contentTypeId = await this.getContentTypeId(baseUrl, url, args.options, logger);
             if (this.verbose) {
@@ -64,7 +64,7 @@ class SpoContentTypeSyncCommand extends SpoCommand {
         if (options.id) {
             return options.id;
         }
-        const siteId = await spo.getSiteId(`${url.origin}/sites/contenttypehub`, logger, this.verbose);
+        const siteId = await spo.getSiteIdByMSGraph(`${url.origin}/sites/contenttypehub`, logger, this.verbose);
         if (this.verbose) {
             await logger.logToStderr(`Retrieving content type Id by name...`);
         }

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

@@ -35,6 +35,9 @@ class SpoFileMoveCommand extends SpoCommand {
             const sourceServerRelativePath = await this.getSourcePath(logger, args.options);
             const sourcePath = this.getAbsoluteUrl(args.options.webUrl, sourceServerRelativePath);
             const destinationPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl);
+            if (args.options.includeItemPermissions) {
+                await this.warn(logger, `Parameter 'includeItemPermissions' is deprecated. Please use 'withItemPermissions' instead`);
+            }
             if (this.verbose) {
                 await logger.logToStderr(`Moving file '${sourceServerRelativePath}' to '${args.options.targetUrl}'...`);
             }
@@ -46,7 +49,7 @@ class SpoFileMoveCommand extends SpoCommand {
             const copyJobResponse = await spo.createFileCopyJob(args.options.webUrl, sourcePath, destinationPath, {
                 nameConflictBehavior: this.getNameConflictBehaviorValue(args.options.nameConflictBehavior),
                 bypassSharedLock: !!args.options.bypassSharedLock,
-                includeItemPermissions: !!args.options.includeItemPermissions,
+                includeItemPermissions: !!args.options.includeItemPermissions || !!args.options.withItemPermissions,
                 newName: newName,
                 operation: 'move'
             });
@@ -119,6 +122,7 @@ _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry
             newName: typeof args.options.newName !== 'undefined',
             nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined',
             includeItemPermissions: !!args.options.includeItemPermissions,
+            withItemPermissions: !!args.options.withItemPermissions,
             bypassSharedLock: !!args.options.bypassSharedLock,
             skipWait: !!args.options.skipWait
         });
@@ -139,6 +143,8 @@ _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry
         autocomplete: this.nameConflictBehaviorOptions
     }, {
         option: '--includeItemPermissions'
+    }, {
+        option: '--withItemPermissions'
     }, {
         option: '--bypassSharedLock'
     }, {
@@ -162,7 +168,7 @@ _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry
     this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
 }, _SpoFileMoveCommand_initTypes = function _SpoFileMoveCommand_initTypes() {
     this.types.string.push('webUrl', 'sourceUrl', 'sourceId', 'targetUrl', 'newName', 'nameConflictBehavior');
-    this.types.boolean.push('includeItemPermissions', 'bypassSharedLock', 'skipWait');
+    this.types.boolean.push('includeItemPermissions', 'withItemPermissions', 'bypassSharedLock', 'skipWait');
 };
 export default new SpoFileMoveCommand();
 //# sourceMappingURL=file-move.js.map

package/dist/m365/spo/commands/folder/folder-sharinglink-add.js

@@ -38,7 +38,7 @@ class SpoFolderSharingLinkAddCommand extends SpoCommand {
             const relFolderUrl = await spo.getFolderServerRelativeUrl(args.options.webUrl, args.options.folderUrl, args.options.folderId, logger, args.options.verbose);
             const absoluteFolderUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, relFolderUrl);
             const folderUrl = new URL(absoluteFolderUrl);
-            const siteId = await spo.getSiteId(args.options.webUrl);
+            const siteId = await spo.getSiteIdByMSGraph(args.options.webUrl);
             const driveDetails = await drive.getDriveByUrl(siteId, folderUrl, logger, args.options.verbose);
             const itemId = await drive.getDriveItemId(driveDetails, folderUrl, logger, args.options.verbose);
             const requestOptions = {

package/dist/m365/spo/commands/folder/folder-sharinglink-clear.js

@@ -39,7 +39,7 @@ class SpoFolderSharingLinkClearCommand extends SpoCommand {
                 const relFolderUrl = await spo.getFolderServerRelativeUrl(args.options.webUrl, args.options.folderUrl, args.options.folderId, logger, args.options.verbose);
                 const absoluteFolderUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, relFolderUrl);
                 const folderUrl = new URL(absoluteFolderUrl);
-                const siteId = await spo.getSiteId(args.options.webUrl);
+                const siteId = await spo.getSiteIdByMSGraph(args.options.webUrl);
                 const driveDetails = await drive.getDriveByUrl(siteId, folderUrl, logger, args.options.verbose);
                 const itemId = await drive.getDriveItemId(driveDetails, folderUrl, logger, args.options.verbose);
                 let requestUrl = `https://graph.microsoft.com/v1.0/drives/${driveDetails.id}/items/${itemId}/permissions?$filter=Link ne null`;

package/dist/m365/spo/commands/folder/folder-sharinglink-get.js

@@ -35,7 +35,7 @@ class SpoFolderSharingLinkGetCommand extends SpoCommand {
             const relFolderUrl = await spo.getFolderServerRelativeUrl(args.options.webUrl, args.options.folderUrl, args.options.folderId);
             const absoluteFolderUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, relFolderUrl);
             const folderUrl = new URL(absoluteFolderUrl);
-            const siteId = await spo.getSiteId(args.options.webUrl);
+            const siteId = await spo.getSiteIdByMSGraph(args.options.webUrl);
             const drive = await driveItem.getDriveByUrl(siteId, folderUrl);
             const itemId = await driveItem.getDriveItemId(drive, folderUrl);
             const requestUrl = `https://graph.microsoft.com/v1.0/drives/${drive.id}/items/${itemId}/permissions/${args.options.id}`;

package/dist/m365/spo/commands/folder/folder-sharinglink-list.js

@@ -40,7 +40,7 @@ class SpoFolderSharingLinkListCommand extends SpoCommand {
             const relFolderUrl = await spo.getFolderServerRelativeUrl(args.options.webUrl, args.options.folderUrl, args.options.folderId, logger, args.options.verbose);
             const absoluteFolderUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, relFolderUrl);
             const folderUrl = new URL(absoluteFolderUrl);
-            const siteId = await spo.getSiteId(args.options.webUrl);
+            const siteId = await spo.getSiteIdByMSGraph(args.options.webUrl);
             const driveDetails = await drive.getDriveByUrl(siteId, folderUrl, logger, args.options.verbose);
             const itemId = await drive.getDriveItemId(driveDetails, folderUrl, logger, args.options.verbose);
             let requestUrl = `https://graph.microsoft.com/v1.0/drives/${driveDetails.id}/items/${itemId}/permissions?$filter=Link ne null`;

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

@@ -37,7 +37,7 @@ class SpoFolderSharingLinkRemoveCommand extends SpoCommand {
                 const relFolderUrl = await spo.getFolderServerRelativeUrl(args.options.webUrl, args.options.folderUrl, args.options.folderId, logger, args.options.verbose);
                 const absoluteFolderUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, relFolderUrl);
                 const folderUrl = new URL(absoluteFolderUrl);
-                const siteId = await spo.getSiteId(args.options.webUrl);
+                const siteId = await spo.getSiteIdByMSGraph(args.options.webUrl);
                 const driveDetails = await drive.getDriveByUrl(siteId, folderUrl, logger, args.options.verbose);
                 const itemId = await drive.getDriveItemId(driveDetails, folderUrl, logger, args.options.verbose);
                 const requestOptions = {

package/dist/m365/spo/commands/folder/folder-sharinglink-set.js

@@ -35,7 +35,7 @@ class SpoFolderSharingLinkSetCommand extends SpoCommand {
             const relFolderUrl = await spo.getFolderServerRelativeUrl(args.options.webUrl, args.options.folderUrl, args.options.folderId, logger, args.options.verbose);
             const absoluteFolderUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, relFolderUrl);
             const folderUrl = new URL(absoluteFolderUrl);
-            const siteId = await spo.getSiteId(args.options.webUrl);
+            const siteId = await spo.getSiteIdByMSGraph(args.options.webUrl);
             const driveDetails = await drive.getDriveByUrl(siteId, folderUrl, logger, args.options.verbose);
             const itemId = await drive.getDriveItemId(driveDetails, folderUrl, logger, args.options.verbose);
             const requestOptions = {

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

@@ -29,12 +29,20 @@ class SpoHubSiteGetCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
+            if (args.options.includeAssociatedSites) {
+                await this.warn(logger, `Parameter 'includeAssociatedSites' is deprecated. Please use 'withAssociatedSites' instead`);
+            }
             const spoUrl = await spo.getSpoUrl(logger, this.debug);
             const hubSite = args.options.id ? await this.getHubSiteById(spoUrl, args.options) : await this.getHubSite(spoUrl, args.options);
-            if (args.options.includeAssociatedSites && (args.options.output && args.options.output !== 'json')) {
-                throw 'includeAssociatedSites option is only allowed with json output mode';
+            if ((args.options.includeAssociatedSites || args.options.withAssociatedSites) && (args.options.output && args.options.output !== 'json')) {
+                if (args.options.includeAssociatedSites) {
+                    throw 'includeAssociatedSites option is only allowed with json output mode';
+                }
+                else {
+                    throw 'withAssociatedSites option is only allowed with json output mode';
+                }
             }
-            if (args.options.includeAssociatedSites === true && args.options.output && !cli.shouldTrimOutput(args.options.output)) {
+            if ((args.options.includeAssociatedSites === true || args.options.withAssociatedSites === true) && args.options.output && !cli.shouldTrimOutput(args.options.output)) {
                 const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
                 const associatedSitesCommandOutput = await this.getAssociatedSites(spoAdminUrl, hubSite.SiteId, logger, args);
                 const associatedSites = JSON.parse(associatedSitesCommandOutput.stdout);
@@ -100,11 +108,12 @@ _SpoHubSiteGetCommand_instances = new WeakSet(), _SpoHubSiteGetCommand_initTelem
             id: typeof args.options.id !== 'undefined',
             title: typeof args.options.title !== 'undefined',
             url: typeof args.options.url !== 'undefined',
-            includeAssociatedSites: args.options.includeAssociatedSites === true
+            includeAssociatedSites: args.options.includeAssociatedSites === true,
+            withAssociatedSites: args.options.withAssociatedSites === true
         });
     });
 }, _SpoHubSiteGetCommand_initOptions = function _SpoHubSiteGetCommand_initOptions() {
-    this.options.unshift({ option: '-i, --id [id]' }, { option: '-t, --title [title]' }, { option: '-u, --url [url]' }, { option: '--includeAssociatedSites' });
+    this.options.unshift({ option: '-i, --id [id]' }, { option: '-t, --title [title]' }, { option: '-u, --url [url]' }, { option: '--includeAssociatedSites' }, { option: '--withAssociatedSites' });
 }, _SpoHubSiteGetCommand_initValidators = function _SpoHubSiteGetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.id && !validation.isValidGuid(args.options.id)) {

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

@@ -29,10 +29,14 @@ class SpoHubSiteListCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
+            if (args.options.includeAssociatedSites) {
+                await this.warn(logger, `Parameter 'includeAssociatedSites' is deprecated. Please use 'withAssociatedSites' instead`);
+            }
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             const hubSitesResult = await odata.getAllItems(`${spoAdminUrl}/_api/hubsites`);
             const hubSites = hubSitesResult;
-            if (!(args.options.includeAssociatedSites !== true || args.options.output && args.options.output !== 'json')) {
+            const shouldIncludeAssociatedSites = args.options.includeAssociatedSites || args.options.withAssociatedSites;
+            if (!(shouldIncludeAssociatedSites !== true || args.options.output && args.options.output !== 'json')) {
                 if (this.debug) {
                     await logger.logToStderr('Retrieving associated sites...');
                     await logger.logToStderr('');
@@ -104,12 +108,15 @@ class SpoHubSiteListCommand extends SpoCommand {
 _SpoHubSiteListCommand_instances = new WeakSet(), _SpoHubSiteListCommand_initTelemetry = function _SpoHubSiteListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            includeAssociatedSites: args.options.includeAssociatedSites === true
+            includeAssociatedSites: args.options.includeAssociatedSites === true,
+            withAssociatedSites: args.options.withAssociatedSites === true
         });
     });
 }, _SpoHubSiteListCommand_initOptions = function _SpoHubSiteListCommand_initOptions() {
     this.options.unshift({
         option: '-i, --includeAssociatedSites'
+    }, {
+        option: '--withAssociatedSites'
     });
 };
 export default new SpoHubSiteListCommand();

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

@@ -10,7 +10,6 @@ import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { spo } from '../../../../utils/spo.js';
-import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
@@ -41,7 +40,9 @@ class SpoListItemBatchSetCommand extends SpoCommand {
             if (!jsonContent[0].hasOwnProperty(idColumn)) {
                 throw `The specified value for idColumn does not exist in the array. Specified idColumn is '${args.options.idColumn || 'ID'}'. Please specify the correct value.`;
             }
-            const listId = await this.getListId(args.options, logger);
+            const listId = args.options.listId ?
+                args.options.listId :
+                await spo.getListId(args.options.webUrl, args.options.listTitle, args.options.listUrl, logger, this.verbose);
             const fields = await this.getListFields(args.options, listId, jsonContent, idColumn, logger);
             const userFields = fields.filter(field => field.TypeAsString === 'UserMulti' || field.TypeAsString === 'User');
             const resolvedUsers = await this.getUsersFromCsv(args.options.webUrl, jsonContent, userFields);
@@ -151,31 +152,6 @@ class SpoListItemBatchSetCommand extends SpoCommand {
         }
         return fields;
     }
-    async getListId(options, logger) {
-        if (options.listId) {
-            return options.listId;
-        }
-        if (this.verbose) {
-            await logger.logToStderr('Retrieving list id');
-        }
-        let listUrl = `${options.webUrl}/_api/web`;
-        if (options.listTitle) {
-            listUrl += `/lists/getByTitle('${formatting.encodeQueryParameter(options.listTitle)}')`;
-        }
-        else {
-            const listServerRelativeUrl = urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
-            listUrl += `/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
-        }
-        const requestOptions = {
-            url: `${listUrl}?$select=Id`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        const listResult = await request.get(requestOptions);
-        return listResult.Id;
-    }
     async getUsersFromCsv(webUrl, jsonContent, userFields) {
         if (userFields.length === 0) {
             return [];

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

@@ -25,7 +25,7 @@ export class Page {
         }
         return ClientSidePage.fromHtml(res.ListItemAllFields.CanvasContent1);
     }
-    static async checkout(name, webUrl, logger, debug, verbose) {
+    static async checkout(name, webUrl, logger, verbose) {
         if (verbose) {
             await logger.log(`Checking out ${name} page...`);
         }
@@ -77,6 +77,21 @@ export class Page {
             columns: section.columns.map(column => this.getColumnsInformation(column, isJSONOutput))
         };
     }
+    /**
+     * Publish a modern page in SharePoint Online
+     * @param webUrl Absolute URL of the SharePoint site where the page is located
+     * @param pageName List relative url of the page to publish
+     */
+    static async publishPage(webUrl, pageName) {
+        const filePath = `${urlUtil.getServerRelativeSiteUrl(webUrl)}/SitePages/${pageName}`;
+        const requestOptions = {
+            url: `${webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(filePath)}')/Publish()`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            }
+        };
+        await request.post(requestOptions);
+    }
     static getPageNameWithExtension(name) {
         let pageName = name;
         if (pageName.indexOf('.aspx') < 0) {

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

@@ -309,6 +309,12 @@ export class ClientSidePage {
                     control.fromHtml(markup);
                     page.pageSettings = control;
                     break;
+                case 1:
+                    // empty canvas column
+                    control = new CanvasColumn(null, 0);
+                    control.fromHtml(markup);
+                    page.mergeColumnToTree(control);
+                    break;
                 case 3:
                     // client side webpart
                     control = new ClientSideWebpart("");
@@ -380,9 +386,9 @@ export class ClientSidePage {
                 }
             }
         }
-        const sections = this.sections.filter(s => s.order === zoneIndex);
+        const sections = this.sections.filter(s => s.order === zoneIndex && s.layoutIndex === (control.controlData?.position.layoutIndex ?? 1));
         if (sections.length < 1) {
-            section = new CanvasSection(this, zoneIndex, [], control?.controlData?.position.zoneId, control.controlData?.zoneGroupMetadata);
+            section = new CanvasSection(this, zoneIndex, [], control?.controlData);
             this.sections.push(section);
         }
         else {
@@ -406,11 +412,11 @@ export class ClientSidePage {
      * @param position The position data for the column
      */
     mergeColumnToTree(column) {
-        const order = column.controlData && hOP(column.controlData, "position") && hOP(column.controlData.position, "zoneIndex") ? column.controlData.position.zoneIndex : 0;
+        const order = column?.controlData?.position.zoneIndex || 0;
         let section = null;
-        const sections = this.sections.filter(s => s.order === order);
+        const sections = this.sections.filter(s => s.order === order && s.layoutIndex === (column?.controlData?.position.layoutIndex ?? 1));
         if (sections.length < 1) {
-            section = new CanvasSection(this, order, [], column.controlData?.position?.zoneId, column.controlData?.zoneGroupMetadata);
+            section = new CanvasSection(this, order, [], column.controlData);
             this.sections.push(section);
         }
         else {
@@ -421,12 +427,16 @@ export class ClientSidePage {
     }
 }
 export class CanvasSection {
-    constructor(page, order, columns = [], zoneId, zoneGroupMetadata) {
+    constructor(page, order, columns = [], controlData) {
         this.page = page;
         this.order = order;
         this.columns = columns;
-        this.zoneId = zoneId;
-        this.zoneGroupMetadata = zoneGroupMetadata;
+        this.controlData = controlData;
+        this.zoneId = this.controlData?.position.zoneId || getGUID();
+        this.zoneGroupMetadata = this.controlData?.zoneGroupMetadata;
+        this.emphasis = this.controlData?.emphasis;
+        this.layoutIndex = this.controlData?.position.layoutIndex ?? 1;
+        this.isLayoutReflowOnTop = this.controlData?.position.isLayoutReflowOnTop;
     }
     /**
      * Default column (this.columns[0]) for this section
@@ -454,7 +464,7 @@ export class CanvasSection {
     }
 }
 class CanvasControl {
-    constructor(controlType, dataVersion, column = undefined, order = 1, id = getGUID(), controlData = null, dynamicDataPaths = null, dynamicDataValues = null) {
+    constructor(controlType, dataVersion, column, order = 1, id = getGUID(), controlData, dynamicDataPaths = null, dynamicDataValues = null) {
         this.controlType = controlType;
         this.dataVersion = dataVersion;
         this.column = column;
@@ -542,16 +552,26 @@ export class CanvasColumn extends CanvasControl {
         }
     }
     getControlData() {
-        return {
-            displayMode: 2,
+        const controlData = {
             position: {
                 sectionFactor: this.factor,
                 sectionIndex: this.order,
-                zoneIndex: this.section ? this.section.order : 0,
-                zoneId: this.section?.zoneId
+                zoneIndex: this.section?.order || 0,
+                zoneId: this.section?.zoneId,
+                layoutIndex: this.section?.layoutIndex,
             },
             zoneGroupMetadata: this.section?.zoneGroupMetadata,
+            emphasis: this.section?.emphasis
         };
+        if (this.column?.section?.isLayoutReflowOnTop !== undefined) {
+            controlData.position.isLayoutReflowOnTop = this.column.section.isLayoutReflowOnTop;
+        }
+        const isEmptyColumn = this.controls.length === 0;
+        if (isEmptyColumn) {
+            controlData.id = "emptySection";
+            controlData.controlType = 1;
+        }
+        return controlData;
     }
     /**
      * Removes this column and all contained controls from the collection
@@ -650,7 +670,7 @@ export class ClientSideText extends ClientSidePart {
         this._text = text;
     }
     getControlData() {
-        return {
+        const controlData = {
             controlType: this.controlType,
             editorType: "CKEditor",
             id: this.id,
@@ -659,10 +679,16 @@ export class ClientSideText extends ClientSidePart {
                 sectionFactor: this.column ? this.column.factor : 0,
                 sectionIndex: this.column ? this.column.order : 0,
                 zoneIndex: this.column && this.column.section ? this.column.section.order : 0,
-                zoneId: this.column?.section?.zoneId
+                zoneId: this.column?.section?.zoneId,
+                layoutIndex: this.column?.section?.layoutIndex
             },
             zoneGroupMetadata: this.column?.section?.zoneGroupMetadata,
+            emphasis: this.column?.section?.emphasis,
         };
+        if (this.column?.section?.isLayoutReflowOnTop !== undefined) {
+            controlData.position.isLayoutReflowOnTop = this.column.section.isLayoutReflowOnTop;
+        }
+        return controlData;
     }
     toHtml(index) {
         // set our order to the value passed in
@@ -767,7 +793,7 @@ export class ClientSideWebpart extends ClientSidePart {
         this.htmlProperties = htmlProps.length > 0 ? htmlProps[0] : "";
     }
     getControlData() {
-        return {
+        const controlData = {
             controlType: this.controlType,
             id: this.id,
             position: {
@@ -775,11 +801,17 @@ export class ClientSideWebpart extends ClientSidePart {
                 sectionFactor: this.column ? this.column.factor : 0,
                 sectionIndex: this.column ? this.column.order : 0,
                 zoneIndex: this.column && this.column.section ? this.column.section.order : 0,
-                zoneId: this.column?.section?.zoneId
+                zoneId: this.column?.section?.zoneId,
+                layoutIndex: this.column?.section?.layoutIndex,
             },
             webPartId: this.webPartId,
             zoneGroupMetadata: this.column?.section?.zoneGroupMetadata,
+            emphasis: this.column?.section?.emphasis,
         };
+        if (this.column?.section?.isLayoutReflowOnTop !== undefined) {
+            controlData.position.isLayoutReflowOnTop = this.column.section.isLayoutReflowOnTop;
+        }
+        return controlData;
     }
     renderHtmlProperties() {
         const html = [];

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

@@ -63,7 +63,7 @@ class SpoPageAddCommand extends SpoCommand {
             itemId = template.UniqueId;
             const file = await spo.getFileAsListItemByUrl(args.options.webUrl, serverRelativeFileUrl, logger, this.verbose);
             const listItemId = file.Id;
-            const pageProps = await Page.checkout(pageName, args.options.webUrl, logger, this.debug, this.verbose);
+            const pageProps = await Page.checkout(pageName, args.options.webUrl, logger, this.verbose);
             if (pageProps) {
                 pageId = pageProps.Id;
                 bannerImageUrl = pageProps.BannerImageUrl;

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

@@ -11,6 +11,7 @@ import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { StandardWebPartUtils } from '../../StandardWebPartTypes.js';
+import { Page } from './Page.js';
 class SpoPageClientSideWebPartAddCommand extends SpoCommand {
     get name() {
         return commands.PAGE_CLIENTSIDEWEBPART_ADD;
@@ -52,14 +53,7 @@ class SpoPageClientSideWebPartAddCommand extends SpoCommand {
             };
             let page = await request.get(requestOptions);
             if (!page.IsPageCheckedOutToCurrentUser) {
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting.encodeQueryParameter(pageFullName)}')/checkoutpage`,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                page = await request.post(requestOptions);
+                page = await Page.checkout(pageFullName, args.options.webUrl, logger, this.verbose);
             }
             if (page) {
                 layoutWebpartsContent = page.LayoutWebpartsContent;