@pnp/cli-microsoft365 7.0.0-beta.7f98bac → 7.0.0-beta.8726fe8

package/dist/m365/spo/commands/group/group-member-add.js

@@ -82,24 +82,24 @@ class SpoGroupMemberAddCommand extends SpoCommand {
             await logger.logToStderr('Checking if the specified users and groups exist');
         }
         const validUserNames = [];
-        const identifiers = args.options.userName ?? args.options.email ?? args.options.aadGroupId ?? args.options.aadGroupName ?? args.options.userId.toString();
+        const identifiers = args.options.userNames ?? args.options.emails ?? args.options.aadGroupIds ?? args.options.aadGroupNames ?? args.options.userIds.toString();
         await Promise.all(identifiers.split(',').map(async (identifier) => {
             const trimmedIdentifier = identifier.trim();
             try {
-                if (args.options.userId) {
+                if (args.options.userIds) {
                     if (this.verbose) {
                         await logger.logToStderr(`Getting AAD ID of user with ID ${trimmedIdentifier}`);
                     }
                     const spoUserAzureId = await spo.getUserAzureIdBySpoId(args.options.webUrl, trimmedIdentifier);
                     validUserNames.push(spoUserAzureId);
                 }
-                else if (args.options.userName) {
+                else if (args.options.userNames) {
                     validUserNames.push(trimmedIdentifier);
                 }
-                else if (args.options.aadGroupId) {
+                else if (args.options.aadGroupIds) {
                     validUserNames.push(trimmedIdentifier);
                 }
-                else if (args.options.aadGroupName) {
+                else if (args.options.aadGroupNames) {
                     if (this.verbose) {
                         await logger.logToStderr(`Getting ID of Azure AD group ${trimmedIdentifier}`);
                     }
@@ -132,11 +132,11 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            email: typeof args.options.email !== 'undefined',
-            userId: typeof args.options.userId !== 'undefined',
-            aadGroupId: typeof args.options.aadGroupId !== 'undefined',
-            aadGroupName: typeof args.options.aadGroupName !== 'undefined'
+            userNames: typeof args.options.userNames !== 'undefined',
+            emails: typeof args.options.emails !== 'undefined',
+            userIds: typeof args.options.userIds !== 'undefined',
+            aadGroupIds: typeof args.options.aadGroupIds !== 'undefined',
+            aadGroupNames: typeof args.options.aadGroupNames !== 'undefined'
         });
     });
 }, _SpoGroupMemberAddCommand_initOptions = function _SpoGroupMemberAddCommand_initOptions() {
@@ -147,15 +147,15 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
     }, {
         option: '--groupName [groupName]'
     }, {
-        option: '--userName [userName]'
+        option: '--userNames [userNames]'
     }, {
-        option: '--email [email]'
+        option: '--emails [emails]'
     }, {
-        option: '--userId [userId]'
+        option: '--userIds [userIds]'
     }, {
-        option: '--aadGroupId [aadGroupId]'
+        option: '--aadGroupIds [aadGroupIds]'
     }, {
-        option: '--aadGroupName [aadGroupName]'
+        option: '--aadGroupNames [aadGroupNames]'
     });
 }, _SpoGroupMemberAddCommand_initValidators = function _SpoGroupMemberAddCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -167,22 +167,22 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
             return `Specified groupId ${args.options.groupId} is not a number`;
         }
         const userIdReg = new RegExp(/^[0-9,]*$/);
-        if (args.options.userId && !userIdReg.test(args.options.userId)) {
-            return `${args.options.userId} is not a number or a comma seperated value`;
+        if (args.options.userIds && !userIdReg.test(args.options.userIds)) {
+            return `${args.options.userIds} is not a number or a comma separated value`;
         }
-        if (args.options.userName && args.options.userName.split(',').some(e => !validation.isValidUserPrincipalName(e))) {
-            return `${args.options.userName} contains one or more invalid usernames`;
+        if (args.options.userNames && args.options.userNames.split(',').some(e => !validation.isValidUserPrincipalName(e))) {
+            return `${args.options.userNames} contains one or more invalid usernames`;
         }
-        if (args.options.email && args.options.email.split(',').some(e => !validation.isValidUserPrincipalName(e))) {
-            return `${args.options.email} contains one or more invalid email addresses`;
+        if (args.options.emails && args.options.emails.split(',').some(e => !validation.isValidUserPrincipalName(e))) {
+            return `${args.options.emails} contains one or more invalid email addresses`;
         }
-        if (args.options.aadGroupId && args.options.aadGroupId.split(',').some(e => !validation.isValidGuid(e))) {
-            return `${args.options.aadGroupId} contains one or more invalid GUIDs`;
+        if (args.options.aadGroupIds && args.options.aadGroupIds.split(',').some(e => !validation.isValidGuid(e))) {
+            return `${args.options.aadGroupIds} contains one or more invalid GUIDs`;
         }
         return true;
     });
 }, _SpoGroupMemberAddCommand_initOptionSets = function _SpoGroupMemberAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userName', 'email', 'userId', 'aadGroupId', 'aadGroupName'] });
+    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userNames', 'emails', 'userIds', 'aadGroupIds', 'aadGroupNames'] });
 };
 export default new SpoGroupMemberAddCommand();
 //# sourceMappingURL=group-member-add.js.map

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/list/list-add.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 _SpoListAddCommand_instances, _SpoListAddCommand_initTelemetry, _SpoListAddCommand_initOptions, _SpoListAddCommand_initValidators, _SpoListAddCommand_initTypes;
+var _SpoListAddCommand_instances, _a, _SpoListAddCommand_initTelemetry, _SpoListAddCommand_initOptions, _SpoListAddCommand_initValidators, _SpoListAddCommand_initTypes;
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -275,7 +275,7 @@ class SpoListAddCommand extends SpoCommand {
         return requestBody;
     }
 }
-_SpoListAddCommand_instances = new WeakSet(), _SpoListAddCommand_initTelemetry = function _SpoListAddCommand_initTelemetry() {
+_a = SpoListAddCommand, _SpoListAddCommand_instances = new WeakSet(), _SpoListAddCommand_initTelemetry = function _SpoListAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         const telemetryProps = {};
         // add properties with identifiable data
@@ -298,7 +298,7 @@ _SpoListAddCommand_instances = new WeakSet(), _SpoListAddCommand_initTelemetry =
             }
         });
         // add boolean values
-        SpoListAddCommand.booleanOptions.forEach(o => {
+        _a.booleanOptions.forEach(o => {
             const value = args.options[o];
             if (value !== undefined) {
                 telemetryProps[o] = value.toString();
@@ -561,7 +561,7 @@ _SpoListAddCommand_instances = new WeakSet(), _SpoListAddCommand_initTelemetry =
     });
 }, _SpoListAddCommand_initTypes = function _SpoListAddCommand_initTypes() {
     this.types.string.push('title', 'baseTemplate', 'webUrl', 'templateFeatureId', 'defaultContentApprovalWorkflowId', 'draftVersionVisibility', 'listExperienceOptions');
-    this.types.boolean.push(...SpoListAddCommand.booleanOptions);
+    this.types.boolean.push(..._a.booleanOptions);
 };
 SpoListAddCommand.booleanOptions = [
     'allowDeletion',

package/dist/m365/spo/commands/list/list-retentionlabel-ensure.js

@@ -26,16 +26,6 @@ class SpoListRetentionLabelEnsureCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoListRetentionLabelEnsureCommand_instances, "m", _SpoListRetentionLabelEnsureCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        if (args.options.label) {
-            args.options.name = args.options.label;
-            this.warn(logger, `Option 'label' is deprecated. Please use 'name' instead`);
-        }
-        if (args.options.blockDelete) {
-            this.warn(logger, `Option 'blockDelete' is deprecated.`);
-        }
-        if (args.options.blockEdit) {
-            this.warn(logger, `Option 'blockEdit' is deprecated.`);
-        }
         try {
             let listRestUrl = '';
             let listServerRelativeUrl = '';
@@ -70,8 +60,6 @@ class SpoListRetentionLabelEnsureCommand extends SpoCommand {
                 data: {
                     listUrl: listAbsoluteUrl,
                     complianceTagValue: args.options.name,
-                    blockDelete: args.options.blockDelete || false,
-                    blockEdit: args.options.blockEdit || false,
                     syncToItems: args.options.syncToItems || false
                 },
                 responseType: 'json'
@@ -86,23 +74,17 @@ class SpoListRetentionLabelEnsureCommand extends SpoCommand {
 _SpoListRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoListRetentionLabelEnsureCommand_initTelemetry = function _SpoListRetentionLabelEnsureCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            name: (!(!args.options.name)).toString(),
-            label: (!(!args.options.label)).toString(),
             listId: (!(!args.options.listId)).toString(),
             listTitle: (!(!args.options.listTitle)).toString(),
             listUrl: (!(!args.options.listUrl)).toString(),
-            syncToItems: args.options.syncToItems || false,
-            blockDelete: args.options.blockDelete || false,
-            blockEdit: args.options.blockEdit || false
+            syncToItems: args.options.syncToItems || false
         });
     });
 }, _SpoListRetentionLabelEnsureCommand_initOptions = function _SpoListRetentionLabelEnsureCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '--name [name]'
-    }, {
-        option: '--label [label]'
+        option: '--name <name>'
     }, {
         option: '-t, --listTitle [listTitle]'
     }, {
@@ -111,10 +93,6 @@ _SpoListRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoListRetention
         option: '--listUrl [listUrl]'
     }, {
         option: '--syncToItems'
-    }, {
-        option: '--blockDelete'
-    }, {
-        option: '--blockEdit'
     });
 }, _SpoListRetentionLabelEnsureCommand_initValidators = function _SpoListRetentionLabelEnsureCommand_initValidators() {
     this.validators.push(async (args) => {

package/dist/m365/spo/commands/list/list-set.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 _SpoListSetCommand_instances, _SpoListSetCommand_initTelemetry, _SpoListSetCommand_initOptions, _SpoListSetCommand_initValidators, _SpoListSetCommand_initTypes, _SpoListSetCommand_initOptionSets;
+var _SpoListSetCommand_instances, _a, _SpoListSetCommand_initTelemetry, _SpoListSetCommand_initOptions, _SpoListSetCommand_initValidators, _SpoListSetCommand_initTypes, _SpoListSetCommand_initOptionSets;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
@@ -277,7 +277,7 @@ class SpoListSetCommand extends SpoCommand {
         return requestBody;
     }
 }
-_SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry = function _SpoListSetCommand_initTelemetry() {
+_a = SpoListSetCommand, _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry = function _SpoListSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         const telemetryProps = {};
         // add properties with identifiable data
@@ -303,7 +303,7 @@ _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry =
             }
         });
         // add boolean values
-        SpoListSetCommand.booleanOptions.forEach(o => {
+        _a.booleanOptions.forEach(o => {
             const value = args.options[o];
             if (value !== undefined) {
                 telemetryProps[o] = value;
@@ -565,7 +565,7 @@ _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry =
     });
 }, _SpoListSetCommand_initTypes = function _SpoListSetCommand_initTypes() {
     this.types.string.push('webUrl', 'templateFeatureId', 'defaultContentApprovalWorkflowId', 'draftVersionVisibility', 'listExperienceOptions');
-    this.types.boolean.push(...SpoListSetCommand.booleanOptions);
+    this.types.boolean.push(..._a.booleanOptions);
 }, _SpoListSetCommand_initOptionSets = function _SpoListSetCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'title', 'url'] });
 };

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/navigation/navigation-node-set.js

@@ -119,8 +119,8 @@ _SpoNavigationNodeSetCommand_instances = new WeakSet(), _SpoNavigationNodeSetCom
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.audienceIds === undefined && !args.options.url && args.options.isExternal === undefined && !args.options.title && args.options.openInNewWindow === undefined) {
-            return `Please specify atleast one property to update.`;
+        if (args.options.audienceIds === undefined && args.options.url === undefined && args.options.isExternal === undefined && !args.options.title && args.options.openInNewWindow === undefined) {
+            return `Please specify at least one property to update.`;
         }
         if (args.options.audienceIds) {
             const audienceIdsSplitted = args.options.audienceIds.split(',');

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

@@ -3,13 +3,19 @@ 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 _SpoOrgAssetsLibraryAddCommand_instances, _SpoOrgAssetsLibraryAddCommand_initTelemetry, _SpoOrgAssetsLibraryAddCommand_initOptions, _SpoOrgAssetsLibraryAddCommand_initValidators;
+var _SpoOrgAssetsLibraryAddCommand_instances, _a, _SpoOrgAssetsLibraryAddCommand_initTelemetry, _SpoOrgAssetsLibraryAddCommand_initOptions, _SpoOrgAssetsLibraryAddCommand_initValidators;
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+var OrgAssetType;
+(function (OrgAssetType) {
+    OrgAssetType[OrgAssetType["ImageDocumentLibrary"] = 1] = "ImageDocumentLibrary";
+    OrgAssetType[OrgAssetType["OfficeTemplateLibrary"] = 2] = "OfficeTemplateLibrary";
+    OrgAssetType[OrgAssetType["OfficeFontLibrary"] = 4] = "OfficeFontLibrary";
+})(OrgAssetType || (OrgAssetType = {}));
 class SpoOrgAssetsLibraryAddCommand extends SpoCommand {
     get name() {
         return commands.ORGASSETSLIBRARY_ADD;
@@ -30,6 +36,7 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand {
         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 reqDigest = await spo.getRequestDigest(spoAdminUrl);
             const requestOptions = {
@@ -37,7 +44,7 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand {
                 headers: {
                     'X-RequestDigest': reqDigest.FormDigestValue
                 },
-                data: `<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><Method Name="AddToOrgAssetsLibAndCdnWithType" Id="11" ObjectPathId="8"><Parameters><Parameter Type="Enum">${cdnType}</Parameter><Parameter Type="String">${args.options.libraryUrl}</Parameter>${thumbnailSchema}<Parameter Type="Enum">1</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="8" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                data: `<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><Method Name="AddToOrgAssetsLibAndCdnWithType" Id="11" ObjectPathId="8"><Parameters><Parameter Type="Enum">${cdnType}</Parameter><Parameter Type="String">${args.options.libraryUrl}</Parameter>${thumbnailSchema}<Parameter Type="Enum">${orgAssetType}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="8" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
             };
             const res = await request.post(requestOptions);
             const json = JSON.parse(res);
@@ -50,12 +57,23 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand {
             this.handleRejectedPromise(err);
         }
     }
+    getOrgAssetType(orgAssetType) {
+        switch (orgAssetType) {
+            case 'OfficeTemplateLibrary':
+                return OrgAssetType.OfficeTemplateLibrary;
+            case 'OfficeFontLibrary':
+                return OrgAssetType.OfficeFontLibrary;
+            default:
+                return OrgAssetType.ImageDocumentLibrary;
+        }
+    }
 }
-_SpoOrgAssetsLibraryAddCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryAddCommand_initTelemetry = function _SpoOrgAssetsLibraryAddCommand_initTelemetry() {
+_a = SpoOrgAssetsLibraryAddCommand, _SpoOrgAssetsLibraryAddCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryAddCommand_initTelemetry = function _SpoOrgAssetsLibraryAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             cdnType: args.options.cdnType || 'Private',
-            thumbnailUrl: typeof args.options.thumbnailUrl !== 'undefined'
+            thumbnailUrl: typeof args.options.thumbnailUrl !== 'undefined',
+            orgAssetType: args.options.orgAssetType
         });
     });
 }, _SpoOrgAssetsLibraryAddCommand_initOptions = function _SpoOrgAssetsLibraryAddCommand_initOptions() {
@@ -65,7 +83,10 @@ _SpoOrgAssetsLibraryAddCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryAd
         option: '--thumbnailUrl [thumbnailUrl]'
     }, {
         option: '--cdnType [cdnType]',
-        autocomplete: ['Public', 'Private']
+        autocomplete: _a.cdnTypes
+    }, {
+        option: '--orgAssetType [orgAssetType]',
+        autocomplete: _a.orgAssetTypes
     });
 }, _SpoOrgAssetsLibraryAddCommand_initValidators = function _SpoOrgAssetsLibraryAddCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -73,8 +94,16 @@ _SpoOrgAssetsLibraryAddCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryAd
         if (typeof args.options.thumbnailUrl !== 'undefined' && isValidThumbnailUrl !== true) {
             return isValidThumbnailUrl;
         }
+        if (args.options.cdnType && _a.cdnTypes.indexOf(args.options.cdnType) < 0) {
+            return `${args.options.cdnType} is not a valid value for cdnType. Valid values are ${_a.cdnTypes.join(', ')}`;
+        }
+        if (args.options.orgAssetType && _a.orgAssetTypes.indexOf(args.options.orgAssetType) < 0) {
+            return `${args.options.orgAssetType} is not a valid value for orgAssetType. Valid values are ${_a.orgAssetTypes.join(', ')}`;
+        }
         return validation.isValidSharePointUrl(args.options.libraryUrl);
     });
 };
+SpoOrgAssetsLibraryAddCommand.orgAssetTypes = ['ImageDocumentLibrary', 'OfficeTemplateLibrary', 'OfficeFontLibrary'];
+SpoOrgAssetsLibraryAddCommand.cdnTypes = ['Public', 'Private'];
 export default new SpoOrgAssetsLibraryAddCommand();
 //# sourceMappingURL=orgassetslibrary-add.js.map

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
  *
@@ -204,7 +222,6 @@ function reindex(collection) {
 export class ClientSidePage {
     constructor() {
         this.sections = [];
-        this.commentsDisabled = false;
     }
     /**
      * Converts a json object to an escaped string appropriate for use in attributes when storing client-side controls
@@ -243,49 +260,6 @@ export class ClientSidePage {
         };
         return JSON.parse(unespace(escapedString));
     }
-    /**
-     * Add a section to this page
-     */
-    addSection(sectionTemplate, order) {
-        var sectionOrder = typeof order !== 'undefined' ? order : getNextOrder(this.sections);
-        var section = new CanvasSection(this, sectionOrder);
-        if (sectionTemplate) {
-            switch (CanvasSectionTemplate[sectionTemplate].toString()) {
-                case CanvasSectionTemplate.OneColumnFullWidth.toString():
-                    section.addColumn(0);
-                    break;
-                case CanvasSectionTemplate.TwoColumn.toString():
-                    section.addColumn(6);
-                    section.addColumn(6);
-                    break;
-                case CanvasSectionTemplate.ThreeColumn.toString():
-                    section.addColumn(4);
-                    section.addColumn(4);
-                    section.addColumn(4);
-                    break;
-                case CanvasSectionTemplate.TwoColumnLeft.toString():
-                    section.addColumn(8);
-                    section.addColumn(4);
-                    break;
-                case CanvasSectionTemplate.TwoColumnRight.toString():
-                    section.addColumn(4);
-                    section.addColumn(8);
-                    break;
-                case CanvasSectionTemplate.OneColumn.toString():
-                default:
-                    section.addColumn(12);
-                    break;
-            }
-        }
-        if (typeof order !== undefined) {
-            // Insert the sections at the specified order.
-            this.sections.splice(sectionOrder - 1, 0, section);
-        }
-        else {
-            this.sections.push(section);
-        }
-        return section;
-    }
     /**
      * Converts this page's content to html markup
      */
@@ -341,14 +315,6 @@ export class ClientSidePage {
         reindex(page.sections);
         return page;
     }
-    /**
-     * Finds a control by the specified instance id
-     *
-     * @param id Instance id of the control to find
-     */
-    findControlById(id) {
-        return this.findControl((c) => c.id === id);
-    }
     /**
      * Finds a control within this page's control tree using the supplied predicate
      *
@@ -441,7 +407,6 @@ export class CanvasSection {
         this.page = page;
         this.order = order;
         this.columns = columns;
-        this._memId = getGUID();
     }
     /**
      * Default column (this.columns[0]) for this section
@@ -460,15 +425,6 @@ export class CanvasSection {
         this.columns.push(column);
         return column;
     }
-    /**
-     * Adds a control to the default column for this section
-     *
-     * @param control Control to add to the default column
-     */
-    addControl(control) {
-        this.defaultColumn.addControl(control);
-        return this;
-    }
     toHtml() {
         const html = [];
         for (let i = 0; i < this.columns.length; i++) {
@@ -476,15 +432,8 @@ export class CanvasSection {
         }
         return html.join("");
     }
-    /**
-     * Removes this section and all contained columns and controls from the collection
-     */
-    remove() {
-        this.page.sections = this.page.sections.filter(section => section._memId !== this._memId);
-        reindex(this.page.sections);
-    }
 }
-export class CanvasControl {
+class CanvasControl {
     constructor(controlType, dataVersion, column = undefined, order = 1, id = getGUID(), controlData = null, dynamicDataPaths = null, dynamicDataValues = null) {
         this.controlType = controlType;
         this.dataVersion = dataVersion;
@@ -534,9 +483,6 @@ export class CanvasColumn extends CanvasControl {
         }
         return this;
     }
-    getControl(index) {
-        return this.controls[index];
-    }
     toHtml() {
         const html = [];
         if (this.controls.length < 1) {
@@ -662,11 +608,6 @@ export class ClientSideWebpart extends ClientSidePart {
         this.dynamicDataPaths = dynamicDataPaths;
         this.dynamicDataValues = dynamicDataValues;
     }
-    static fromComponentDef(definition) {
-        const part = new ClientSideWebpart("");
-        part.import(definition);
-        return part;
-    }
     import(component) {
         this.webPartId = component.Id.replace(/^\{|\}$/g, "").toLowerCase();
         const manifest = JSON.parse(component.Manifest);
@@ -679,9 +620,6 @@ export class ClientSideWebpart extends ClientSidePart {
         this.propertieJson = extend(this.propertieJson, properties);
         return this;
     }
-    getProperties() {
-        return this.propertieJson;
-    }
     toHtml(index) {
         // set our order to the value passed in
         this.order = index;

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);
             }
         }