@pnp/cli-microsoft365 11.5.0 → 11.6.0-beta.1d74bb5

package/dist/m365/spo/commands/app/app-deploy.js

@@ -25,12 +25,10 @@ class SpoAppDeployCommand extends SpoAppBaseCommand {
         __classPrivateFieldGet(this, _SpoAppDeployCommand_instances, "m", _SpoAppDeployCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        let appId = '';
         const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
-        let appCatalogUrl = '';
         try {
             const spoUrl = await spo.getSpoUrl(logger, this.debug);
-            appCatalogUrl = await this.getAppCatalogSiteUrl(logger, spoUrl, args);
+            const appCatalogUrl = await this.getAppCatalogSiteUrl(logger, spoUrl, args);
             let res;
             if (args.options.id) {
                 if (this.verbose) {
@@ -51,7 +49,7 @@ class SpoAppDeployCommand extends SpoAppBaseCommand {
                 };
                 res = await request.get(requestOptions);
             }
-            appId = res.UniqueId;
+            const appId = res.UniqueId;
             if (this.verbose) {
                 await logger.logToStderr(`Deploying app...`);
             }

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

@@ -28,11 +28,9 @@ class SpoAppListCommand extends SpoAppBaseCommand {
     }
     async commandAction(logger, args) {
         const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
-        let appCatalogSiteUrl = '';
-        let spoUrl = '';
         try {
-            spoUrl = await spo.getSpoUrl(logger, this.debug);
-            appCatalogSiteUrl = await this.getAppCatalogSiteUrl(logger, spoUrl, args);
+            const spoUrl = await spo.getSpoUrl(logger, this.debug);
+            const appCatalogSiteUrl = await this.getAppCatalogSiteUrl(logger, spoUrl, args);
             if (this.verbose) {
                 await logger.logToStderr(`Retrieving apps...`);
             }

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

@@ -28,11 +28,9 @@ class SpoCdnGetCommand extends SpoCommand {
     async commandAction(logger, args) {
         const cdnTypeString = args.options.type || 'Public';
         const cdnType = cdnTypeString === 'Private' ? 1 : 0;
-        let spoAdminUrl = '';
-        let tenantId = '';
         try {
-            tenantId = await spo.getTenantId(logger, this.debug);
-            spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+            const tenantId = await spo.getTenantId(logger, this.debug);
+            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             const reqDigest = await spo.getRequestDigest(spoAdminUrl);
             if (this.verbose) {
                 await logger.logToStderr(`Retrieving status of ${(cdnType === 1 ? 'Private' : 'Public')} CDN...`);

package/dist/m365/spo/commands/cdn/cdn-origin-add.js

@@ -27,11 +27,9 @@ class SpoCdnOriginAddCommand extends SpoCommand {
     async commandAction(logger, args) {
         const cdnTypeString = args.options.type || 'Public';
         const cdnType = cdnTypeString === 'Private' ? 1 : 0;
-        let spoAdminUrl = '';
-        let tenantId = '';
         try {
-            tenantId = await spo.getTenantId(logger, this.debug);
-            spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+            const tenantId = await spo.getTenantId(logger, this.debug);
+            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             const reqDigest = await spo.getRequestDigest(spoAdminUrl);
             if (this.verbose) {
                 await logger.logToStderr(`Adding origin ${args.options.origin} to the ${(cdnType === 1 ? 'Private' : 'Public')} CDN. Please wait, this might take a moment...`);

package/dist/m365/spo/commands/cdn/cdn-origin-list.js

@@ -26,11 +26,9 @@ class SpoCdnOriginListCommand extends SpoCommand {
     async commandAction(logger, args) {
         const cdnTypeString = args.options.type || 'Public';
         const cdnType = cdnTypeString === 'Private' ? 1 : 0;
-        let spoAdminUrl = '';
-        let tenantId = '';
         try {
-            tenantId = await spo.getTenantId(logger, this.debug);
-            spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+            const tenantId = await spo.getTenantId(logger, this.debug);
+            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             const reqDigest = await spo.getRequestDigest(spoAdminUrl);
             if (this.verbose) {
                 await logger.logToStderr(`Retrieving configured origins for ${(cdnType === 1 ? 'Private' : 'Public')} CDN...`);

package/dist/m365/spo/commands/cdn/cdn-policy-list.js

@@ -26,11 +26,9 @@ class SpoCdnPolicyListCommand extends SpoCommand {
     async commandAction(logger, args) {
         const cdnTypeString = args.options.cdnType || 'Public';
         const cdnType = cdnTypeString === 'Private' ? 1 : 0;
-        let spoAdminUrl = '';
-        let tenantId = '';
         try {
-            tenantId = await spo.getTenantId(logger, this.debug);
-            spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+            const tenantId = await spo.getTenantId(logger, this.debug);
+            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             const reqDigest = await spo.getRequestDigest(spoAdminUrl);
             if (this.verbose) {
                 await logger.logToStderr(`Retrieving configured policies for ${(cdnType === 1 ? 'Private' : 'Public')} CDN...`);

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

@@ -28,8 +28,7 @@ class SpoCdnSetCommand extends SpoCommand {
     async commandAction(logger, args) {
         const cdnTypeString = args.options.type || 'Public';
         const enabled = args.options.enabled;
-        let cdnType = 0;
-        let spoAdminUrl = '';
+        let cdnType;
         switch (cdnTypeString) {
             case "Private": {
                 cdnType = 1;
@@ -45,7 +44,7 @@ class SpoCdnSetCommand extends SpoCommand {
             }
         }
         try {
-            spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             const reqDigest = await spo.getRequestDigest(spoAdminUrl);
             let requestBody = '';
             if (cdnType === 2) {

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

@@ -129,9 +129,9 @@ class SpoContentTypeSetCommand extends SpoCommand {
         }
         let baseString = ':list:';
         if (options.listId) {
-            return baseString += options.listId;
+            return baseString + options.listId;
         }
-        return baseString += await spo.getListId(options.webUrl, options.listTitle, options.listUrl, logger, this.verbose);
+        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/field/field-get.js

@@ -37,7 +37,7 @@ class SpoFieldGetCommand extends SpoCommand {
             const listServerRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
             listRestUrl = `GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
         }
-        let fieldRestUrl = '';
+        let fieldRestUrl;
         if (args.options.id) {
             fieldRestUrl = `/getbyid('${formatting.encodeQueryParameter(args.options.id)}')`;
         }

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

@@ -38,7 +38,7 @@ class SpoFieldRemoveCommand extends SpoCommand {
             if (this.verbose) {
                 await logger.logToStderr(`Removing field ${fieldId || title || internalName} ${messageEnd}...`);
             }
-            let fieldRestUrl = '';
+            let fieldRestUrl;
             if (fieldId) {
                 fieldRestUrl = `/getbyid('${formatting.encodeQueryParameter(fieldId)}')`;
             }

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

@@ -38,7 +38,7 @@ class SpoFileRemoveCommand extends SpoCommand {
             if (this.verbose) {
                 await logger.logToStderr(`Removing file in site at ${args.options.webUrl}...`);
             }
-            let requestUrl = '';
+            let requestUrl;
             if (args.options.id) {
                 requestUrl = `${args.options.webUrl}/_api/web/GetFileById(guid'${formatting.encodeQueryParameter(args.options.id)}')`;
             }

package/dist/m365/spo/commands/file/file-sharinginfo-get.js

@@ -82,7 +82,7 @@ class SpoFileSharingInfoGetCommand extends SpoCommand {
         }
     }
     async getNeededFileInformation(args) {
-        let requestUrl = '';
+        let requestUrl;
         if (args.options.fileId) {
             requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${args.options.fileId}')/?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
         }

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

@@ -31,7 +31,7 @@ class SpoListRemoveCommand extends SpoCommand {
             if (this.verbose) {
                 await logger.logToStderr(`Removing list in site at ${args.options.webUrl}...`);
             }
-            let requestUrl = '';
+            let requestUrl;
             if (args.options.id) {
                 requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting.encodeQueryParameter(args.options.id)}')`;
             }

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

@@ -37,7 +37,6 @@ class SpoListViewFieldAddCommand extends SpoCommand {
             const listServerRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
             listSelector = `GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
         }
-        let viewSelector = '';
         let currentField;
         if (this.verbose) {
             await logger.logToStderr(`Getting field ${args.options.id || args.options.title}...`);
@@ -48,7 +47,7 @@ class SpoListViewFieldAddCommand extends SpoCommand {
                 await logger.logToStderr(`Adding the field ${args.options.id || args.options.title} to the view ${args.options.viewId || args.options.viewTitle}...`);
             }
             currentField = field;
-            viewSelector = args.options.viewId ? `('${formatting.encodeQueryParameter(args.options.viewId)}')` : `/GetByTitle('${formatting.encodeQueryParameter(args.options.viewTitle)}')`;
+            const viewSelector = args.options.viewId ? `('${formatting.encodeQueryParameter(args.options.viewId)}')` : `/GetByTitle('${formatting.encodeQueryParameter(args.options.viewTitle)}')`;
             const postRequestUrl = `${args.options.webUrl}/_api/web/${listSelector}/views${viewSelector}/viewfields/addviewfield('${field.InternalName}')`;
             const postRequestOptions = {
                 url: postRequestUrl,

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

@@ -41,8 +41,7 @@ class SpoListItemIsRecordCommand extends SpoCommand {
             const listServerRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
             requestUrl += `/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
         }
-        let formDigestValue = '';
-        let listId = '';
+        let listId;
         if (this.debug) {
             await logger.logToStderr(`Retrieving access token for ${resource}...`);
         }
@@ -71,7 +70,7 @@ class SpoListItemIsRecordCommand extends SpoCommand {
                 await logger.logToStderr(`Getting request digest for request`);
             }
             const reqDigest = await spo.getRequestDigest(args.options.webUrl);
-            formDigestValue = reqDigest.FormDigestValue;
+            const formDigestValue = reqDigest.FormDigestValue;
             const webIdentityResp = await spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
             if (this.verbose) {
                 await logger.logToStderr(`Checking if list item is a record in list ${args.options.listId ? args.options.listId : args.options.listTitle ? args.options.listTitle : args.options.listUrl} in site ${args.options.webUrl}...`);

package/dist/m365/spo/commands/listitem/listitem-record-declare.js

@@ -81,7 +81,7 @@ class SpoListItemRecordDeclareCommand extends SpoCommand {
         }
     }
     getDeclareRecordRequestBody(webIdentity, listId, id, date) {
-        let requestBody = '';
+        let requestBody;
         if (date.length === 10) {
             requestBody = `<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><StaticMethod TypeId="{ea8e1356-5910-4e69-bc05-d0c30ed657fc}" Name="DeclareItemAsRecordWithDeclarationDate" Id="48"><Parameters><Parameter ObjectPathId="21" /><Parameter Type="DateTime">${date}</Parameter></Parameters></StaticMethod></Actions><ObjectPaths><Identity Id="21" Name="${webIdentity}:list:${listId}:item:${id},1" /></ObjectPaths></Request>`;
         }

package/dist/m365/spo/commands/navigation/navigation-node-get.js

@@ -1,13 +1,18 @@
-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 _SpoNavigationNodeGetCommand_instances, _SpoNavigationNodeGetCommand_initOptions, _SpoNavigationNodeGetCommand_initValidators;
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u'),
+    id: z.int().positive()
+});
 class SpoNavigationNodeGetCommand extends SpoCommand {
     get name() {
         return commands.NAVIGATION_NODE_GET;
@@ -15,25 +20,25 @@ class SpoNavigationNodeGetCommand extends SpoCommand {
     get description() {
         return 'Retrieve information about a specific navigation node';
     }
-    constructor() {
-        super();
-        _SpoNavigationNodeGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoNavigationNodeGetCommand_instances, "m", _SpoNavigationNodeGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoNavigationNodeGetCommand_instances, "m", _SpoNavigationNodeGetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving information about navigation node with id ${args.options.id}`);
         }
         const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/navigation/GetNodeById(${args.options.id})`,
+            url: `${args.options.webUrl}/_api/web/navigation/GetNodeById(${args.options.id})?$expand=Children,Children/Children,Children/Children/Children`,
             headers: {
-                'accept': 'application/json;odata=nometadata'
+                accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
         try {
             const listInstance = await request.get(requestOptions);
+            if (listInstance['odata.null']) {
+                throw `No navigation node found with id ${args.options.id}.`;
+            }
             await logger.log(listInstance);
         }
         catch (err) {
@@ -41,20 +46,5 @@ class SpoNavigationNodeGetCommand extends SpoCommand {
         }
     }
 }
-_SpoNavigationNodeGetCommand_instances = new WeakSet(), _SpoNavigationNodeGetCommand_initOptions = function _SpoNavigationNodeGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--id <id>'
-    });
-}, _SpoNavigationNodeGetCommand_initValidators = function _SpoNavigationNodeGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const id = parseInt(args.options.id);
-        if (isNaN(id)) {
-            return `${args.options.id} is not a valid number`;
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-};
 export default new SpoNavigationNodeGetCommand();
 //# sourceMappingURL=navigation-node-get.js.map

package/dist/m365/spo/commands/navigation/navigation-node-list.js

@@ -1,13 +1,18 @@
-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 _SpoNavigationNodeListCommand_instances, _SpoNavigationNodeListCommand_initTelemetry, _SpoNavigationNodeListCommand_initOptions, _SpoNavigationNodeListCommand_initValidators;
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u'),
+    location: z.enum(['QuickLaunch', 'TopNavigationBar']).alias('l')
+});
 class SpoNavigationNodeListCommand extends SpoCommand {
     get name() {
         return commands.NAVIGATION_NODE_LIST;
@@ -18,19 +23,15 @@ class SpoNavigationNodeListCommand extends SpoCommand {
     defaultProperties() {
         return ['Id', 'Title', 'Url'];
     }
-    constructor() {
-        super();
-        _SpoNavigationNodeListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoNavigationNodeListCommand_instances, "m", _SpoNavigationNodeListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoNavigationNodeListCommand_instances, "m", _SpoNavigationNodeListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoNavigationNodeListCommand_instances, "m", _SpoNavigationNodeListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving navigation nodes...`);
         }
         try {
-            const res = await odata.getAllItems(`${args.options.webUrl}/_api/web/navigation/${args.options.location.toLowerCase()}`);
+            const res = await odata.getAllItems(`${args.options.webUrl}/_api/web/navigation/${args.options.location.toLowerCase()}?$expand=Children,Children/Children,Children/Children/Children`);
             await logger.log(res);
         }
         catch (err) {
@@ -38,31 +39,5 @@ class SpoNavigationNodeListCommand extends SpoCommand {
         }
     }
 }
-_SpoNavigationNodeListCommand_instances = new WeakSet(), _SpoNavigationNodeListCommand_initTelemetry = function _SpoNavigationNodeListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            location: args.options.location
-        });
-    });
-}, _SpoNavigationNodeListCommand_initOptions = function _SpoNavigationNodeListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-l, --location <location>',
-        autocomplete: ['QuickLaunch', 'TopNavigationBar']
-    });
-}, _SpoNavigationNodeListCommand_initValidators = function _SpoNavigationNodeListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.location !== 'QuickLaunch' &&
-            args.options.location !== 'TopNavigationBar') {
-            return `${args.options.location} is not a valid value for the location option. Allowed values are QuickLaunch|TopNavigationBar`;
-        }
-        return true;
-    });
-};
 export default new SpoNavigationNodeListCommand();
 //# sourceMappingURL=navigation-node-list.js.map

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

@@ -31,13 +31,12 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoOrgAssetsLibraryAddCommand_instances, "m", _SpoOrgAssetsLibraryAddCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        let spoAdminUrl = '';
         const cdnTypeString = args.options.cdnType || 'Private';
         const cdnType = cdnTypeString === 'Private' ? 1 : 0;
         const thumbnailSchema = typeof args.options.thumbnailUrl === 'undefined' ? `<Parameter Type="Null" />` : `<Parameter Type="String">${args.options.thumbnailUrl}</Parameter>`;
         try {
             const orgAssetType = this.getOrgAssetType(args.options.orgAssetType);
-            spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             const reqDigest = await spo.getRequestDigest(spoAdminUrl);
             const requestOptions = {
                 url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,

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

@@ -158,8 +158,8 @@ function getBoundedDivMarkup(html, boundaryStartPattern, collector) {
         // we have one open div counting from the one found above using boundaryStartPattern so we need to ensure we find it's close
         let openCounter = 1;
         let searchIndex = startIndex + 1;
-        let nextDivOpen = -1;
-        let nextCloseDiv = -1;
+        let nextDivOpen;
+        let nextCloseDiv;
         // this loop finds the </div> tag that matches the opening of the control
         while (true) {
             // find both the next opening and closing div tags from our current searching index
@@ -299,7 +299,7 @@ export class ClientSidePage {
             const ct = /controlType&quot;&#58;(\d*?)(,|&)/i.exec(markup);
             // if no control type is present this is a column which we give type 0 to let us process it
             const controlType = ct === null || ct.length < 0 ? -1 : parseInt(ct[1], 10);
-            let control = null;
+            let control;
             switch (controlType) {
                 case -1:
                     // empty canvas column
@@ -371,8 +371,8 @@ export class ClientSidePage {
      * @param control The control to merge
      */
     mergePartToTree(control) {
-        let section = null;
-        let column = null;
+        let section;
+        let column;
         let sectionFactor = 12;
         let sectionIndex = 0;
         let zoneIndex = 0;
@@ -417,7 +417,7 @@ export class ClientSidePage {
      */
     mergeColumnToTree(column) {
         const order = column?.controlData?.position.zoneIndex || 0;
-        let section = null;
+        let section;
         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);

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

@@ -27,8 +27,6 @@ class SpoPageAddCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoPageAddCommand_instances, "m", _SpoPageAddCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        let requestDigest = '';
-        let itemId = '';
         let pageName = args.options.name;
         const fileNameWithoutExtension = pageName.replace('.aspx', '');
         let bannerImageUrl = '';
@@ -44,7 +42,7 @@ class SpoPageAddCommand extends SpoCommand {
         const serverRelativeFileUrl = `${listServerRelativeUrl}/${pageName}`;
         try {
             const reqDigest = await spo.getRequestDigest(args.options.webUrl);
-            requestDigest = reqDigest.FormDigestValue;
+            const requestDigest = reqDigest.FormDigestValue;
             let requestOptions = {
                 url: `${args.options.webUrl}/_api/sitepages/pages`,
                 responseType: 'json',
@@ -60,7 +58,7 @@ class SpoPageAddCommand extends SpoCommand {
                 }
             };
             const template = await request.post(requestOptions);
-            itemId = template.UniqueId;
+            const 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.verbose);

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

@@ -119,7 +119,6 @@ class SpoPageHeaderSetCommand extends SpoCommand {
                 translateY: 0
             }
         };
-        let header = defaultPageHeader;
         let pageFullName = args.options.pageName.toLowerCase();
         if (!pageFullName.endsWith('.aspx')) {
             pageFullName += '.aspx';
@@ -127,7 +126,6 @@ class SpoPageHeaderSetCommand extends SpoCommand {
         let canvasContent = "";
         let bannerImageUrl = "";
         let description = "";
-        let title = "";
         let authorByline = args.options.authors ? args.options.authors.split(',').map(a => a.trim()) : [];
         let topicHeader = args.options.topicHeader || "";
         if (this.verbose) {
@@ -142,7 +140,7 @@ class SpoPageHeaderSetCommand extends SpoCommand {
                 responseType: 'json'
             };
             const page = await request.get(requestOptions);
-            title = page.Title;
+            let title = page.Title;
             let pageData;
             if (page.IsPageCheckedOutToCurrentUser) {
                 const requestOptions = {
@@ -157,18 +155,18 @@ class SpoPageHeaderSetCommand extends SpoCommand {
             else {
                 pageData = await Page.checkout(pageFullName, args.options.webUrl, logger, this.verbose);
             }
+            let header;
             switch (args.options.type) {
                 case 'None':
                     header = noPageHeader;
                     break;
-                case 'Default':
-                    header = defaultPageHeader;
-                    break;
                 case 'Custom':
                     header = customPageHeader;
                     break;
+                case 'Default':
                 default:
                     header = defaultPageHeader;
+                    break;
             }
             if (pageData) {
                 canvasContent = pageData.CanvasContent1;

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

@@ -128,34 +128,34 @@ class SpoPageSectionAddCommand extends SpoCommand {
         let sectionIndex = 1;
         switch (args.options.sectionTemplate) {
             case 'OneColumnFullWidth':
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 0, args, zoneId));
+                columns.push(this.getColumn(zoneIndex, sectionIndex, 0, args, zoneId));
                 break;
             case 'TwoColumn':
                 columns.push(this.getColumn(zoneIndex, sectionIndex++, 6, args, zoneId));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 6, args, zoneId));
+                columns.push(this.getColumn(zoneIndex, sectionIndex, 6, args, zoneId));
                 break;
             case 'ThreeColumn':
                 columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, args, zoneId));
                 columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, args, zoneId));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, args, zoneId));
+                columns.push(this.getColumn(zoneIndex, sectionIndex, 4, args, zoneId));
                 break;
             case 'TwoColumnLeft':
                 columns.push(this.getColumn(zoneIndex, sectionIndex++, 8, args, zoneId));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, args, zoneId));
+                columns.push(this.getColumn(zoneIndex, sectionIndex, 4, args, zoneId));
                 break;
             case 'TwoColumnRight':
                 columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, args, zoneId));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 8, args, zoneId));
+                columns.push(this.getColumn(zoneIndex, sectionIndex, 8, args, zoneId));
                 break;
             case 'Vertical':
                 columns.push(this.getVerticalColumn(args, zoneId));
                 break;
             case 'Flexible':
-                columns.push(this.getFlexibleColumn(zoneIndex, sectionIndex++, args, zoneId));
+                columns.push(this.getFlexibleColumn(zoneIndex, sectionIndex, args, zoneId));
                 break;
             case 'OneColumn':
             default:
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 12, args, zoneId));
+                columns.push(this.getColumn(zoneIndex, sectionIndex, 12, args, zoneId));
                 break;
         }
         return columns;

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

@@ -32,14 +32,8 @@ class SpoPageSetCommand extends SpoCommand {
         const resource = Auth.getResourceFromUrl(args.options.webUrl);
         let pageName = args.options.name;
         const fileNameWithoutExtension = pageName.replace('.aspx', '');
-        let bannerImageUrl = '';
-        let canvasContent1 = '';
-        let layoutWebpartsContent = '';
         let pageTitle = args.options.title || "";
-        let pageId = null;
         let pageDescription = args.options.description || "";
-        let topicHeader = "";
-        let authorByline = [];
         const pageData = {};
         if (!pageName.endsWith('.aspx')) {
             pageName += '.aspx';
@@ -54,13 +48,13 @@ class SpoPageSetCommand extends SpoCommand {
             const requestDigest = requestDigestResult.FormDigestValue;
             const page = await Page.checkout(args.options.name, args.options.webUrl, logger, this.verbose);
             pageTitle = pageTitle || page.Title;
-            pageId = page.Id;
-            bannerImageUrl = page.BannerImageUrl;
-            canvasContent1 = args.options.content || page.CanvasContent1;
-            layoutWebpartsContent = page.LayoutWebpartsContent;
+            let pageId = page.Id;
+            const bannerImageUrl = page.BannerImageUrl;
+            const canvasContent1 = args.options.content || page.CanvasContent1;
+            const layoutWebpartsContent = page.LayoutWebpartsContent;
             pageDescription = pageDescription || page.Description;
-            topicHeader = page.TopicHeader;
-            authorByline = page.AuthorByline;
+            const topicHeader = page.TopicHeader;
+            const authorByline = page.AuthorByline;
             if (args.options.layoutType) {
                 const listItemSetOptions = {
                     PageLayoutType: args.options.layoutType

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

@@ -27,7 +27,6 @@ class SpoPageTextAddCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoPageTextAddCommand_instances, "m", _SpoPageTextAddCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        let requestDigest = '';
         let pageName = args.options.pageName;
         if (args.options.pageName.indexOf('.aspx') < 0) {
             pageName += '.aspx';
@@ -38,7 +37,7 @@ class SpoPageTextAddCommand extends SpoCommand {
         try {
             const reqDigest = await spo.getRequestDigest(args.options.webUrl);
             // Keep the reference of request digest for subsequent requests
-            requestDigest = reqDigest.FormDigestValue;
+            const requestDigest = reqDigest.FormDigestValue;
             if (this.verbose) {
                 await logger.logToStderr(`Retrieving modern page ${pageName}...`);
             }