@pnp/cli-microsoft365 10.8.0-beta.cdb5c81 → 10.9.0-beta.3261443

package/dist/m365/flow/commands/flow-list.js

@@ -28,29 +28,33 @@ class FlowListCommand extends PowerAutomateCommand {
         __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
+        if (args.options.includeSolutions) {
+            await this.warn(logger, `Parameter 'includeSolutions' is deprecated. Please use 'withSolutions' instead`);
+        }
         if (this.verbose) {
             await logger.logToStderr(`Getting Power Automate flows${args.options.asAdmin ? ' as admin' : ''} in environment '${args.options.environmentName}'...`);
         }
         try {
-            const { environmentName, asAdmin, sharingStatus, includeSolutions } = args.options;
+            const { environmentName, asAdmin, sharingStatus, includeSolutions, withSolutions } = args.options;
             let items = [];
+            const shouldIncludeSolutions = withSolutions || includeSolutions;
             if (sharingStatus === 'personal') {
-                const url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'personal');
+                const url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions, 'personal');
                 items = await odata.getAllItems(url);
             }
             else if (sharingStatus === 'sharedWithMe') {
-                const url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'team');
+                const url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions, 'team');
                 items = await odata.getAllItems(url);
             }
             else if (sharingStatus === 'all') {
-                let url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'personal');
+                let url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions, 'personal');
                 items = await odata.getAllItems(url);
-                url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'team');
+                url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions, 'team');
                 const teamFlows = await odata.getAllItems(url);
                 items = items.concat(teamFlows);
             }
             else {
-                const url = this.getApiUrl(environmentName, asAdmin, includeSolutions);
+                const url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions);
                 items = await odata.getAllItems(url);
             }
             // Remove duplicates
@@ -81,6 +85,7 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
         Object.assign(this.telemetryProperties, {
             sharingStatus: typeof args.options.sharingStatus !== 'undefined',
             includeSolutions: !!args.options.includeSolutions,
+            withSolutions: !!args.options.withSolutions,
             asAdmin: !!args.options.asAdmin
         });
     });
@@ -92,6 +97,8 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
         autocomplete: this.allowedSharingStatuses
     }, {
         option: '--includeSolutions'
+    }, {
+        option: '--withSolutions'
     }, {
         option: '--asAdmin'
     });
@@ -107,7 +114,7 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
     });
 }, _FlowListCommand_initTypes = function _FlowListCommand_initTypes() {
     this.types.string.push('environmentName', 'sharingStatus');
-    this.types.boolean.push('includeSolutions', 'asAdmin');
+    this.types.boolean.push('includeSolutions', 'withSolutions', 'asAdmin');
 };
 export default new FlowListCommand();
 //# sourceMappingURL=flow-list.js.map

package/dist/m365/flow/commands/run/run-get.js

@@ -28,7 +28,7 @@ class FlowRunGetCommand extends PowerAutomateCommand {
             await logger.logToStderr(`Retrieving information about run ${args.options.name} of Microsoft Flow ${args.options.flowName}...`);
         }
         if (args.options.includeTriggerInformation) {
-            await this.warn(logger, `Parameter 'includeTriggerInformation' is deprecated. Please use 'withTrigger instead`);
+            await this.warn(logger, `Parameter 'includeTriggerInformation' is deprecated. Please use 'withTrigger' instead`);
         }
         const actionsParameter = args.options.withActions ? '$expand=properties%2Factions&' : '';
         const requestOptions = {

package/dist/m365/graph/commands/directoryextension/directoryextension-list.js

@@ -0,0 +1,74 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import request from '../../../../request.js';
+import commands from '../../commands.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import { validation } from '../../../../utils/validation.js';
+import { entraApp } from '../../../../utils/entraApp.js';
+import { odata } from '../../../../utils/odata.js';
+const options = globalOptionsZod
+    .extend({
+    appId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    appObjectId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    appName: z.string().optional()
+})
+    .strict();
+class GraphDirectoryExtensionListCommand extends GraphCommand {
+    get name() {
+        return commands.DIRECTORYEXTENSION_LIST;
+    }
+    get description() {
+        return 'Retrieves a list of directory extensions';
+    }
+    defaultProperties() {
+        return ['id', 'name', 'appDisplayName'];
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => ([options.appId, options.appObjectId, options.appName].filter(x => x !== undefined).length <= 1), {
+            message: 'Specify either appId, appObjectId, or appName, but not multiple.'
+        });
+    }
+    async commandAction(logger, args) {
+        try {
+            if (args.options.appId || args.options.appObjectId || args.options.appName) {
+                const appObjectId = await this.getAppObjectId(args.options);
+                const endpoint = `${this.resource}/v1.0/applications/${appObjectId}/extensionProperties/`;
+                const items = await odata.getAllItems(endpoint);
+                await logger.log(items);
+            }
+            else {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/directoryObjects/getAvailableExtensionProperties`,
+                    headers: {
+                        'content-type': 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = await request.post(requestOptions);
+                await logger.log(res.value);
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getAppObjectId(options) {
+        if (options.appObjectId) {
+            return options.appObjectId;
+        }
+        if (options.appId) {
+            return (await entraApp.getAppRegistrationByAppId(options.appId, ["id"])).id;
+        }
+        return (await entraApp.getAppRegistrationByAppName(options.appName, ["id"])).id;
+    }
+}
+export default new GraphDirectoryExtensionListCommand();
+//# sourceMappingURL=directoryextension-list.js.map

package/dist/m365/graph/commands/subscription/subscription-add.js

@@ -49,7 +49,7 @@ class GraphSubscriptionAddCommand extends GraphCommand {
             notificationUrl: args.options.notificationUrl,
             expirationDateTime: await this.getExpirationDateTimeOrDefault(logger, args),
             clientState: args.options.clientState,
-            includeResourceData: args.options.includeResourceData,
+            includeResourceData: args.options.withResourceData || args.options.includeResourceData,
             encryptionCertificate: args.options.encryptionCertificate,
             encryptionCertificateId: args.options.encryptionCertificateId,
             lifecycleNotificationUrl: args.options.lifecycleNotificationUrl,
@@ -66,6 +66,9 @@ class GraphSubscriptionAddCommand extends GraphCommand {
             responseType: 'json'
         };
         try {
+            if (args.options.includeResourceData) {
+                await this.warn(logger, `Parameter 'includeResourceData' is deprecated. Please use 'withResourceData' instead`);
+            }
             const res = await request.post(requestOptions);
             await logger.log(res);
         }
@@ -133,6 +136,7 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
             notificationUrlAppId: typeof args.options.notificationUrlAppId !== 'undefined',
             latestTLSVersion: typeof args.options.latestTLSVersion !== 'undefined',
             includeResourceData: !!args.options.includeResourceData,
+            withResourceData: !!args.options.withResourceData,
             encryptionCertificate: typeof args.options.encryptionCertificate !== 'undefined',
             encryptionCertificateId: typeof args.options.encryptionCertificateId !== 'undefined'
         });
@@ -158,6 +162,8 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
         autocomplete: this.allowedTlsVersions
     }, {
         option: '--includeResourceData [includeResourceData]'
+    }, {
+        option: '--withResourceData [withResourceData]'
     }, {
         option: '--encryptionCertificate [encryptionCertificate]'
     }, {
@@ -187,10 +193,11 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
         if (args.options.latestTLSVersion && this.allowedTlsVersions.map(x => x.toLowerCase()).indexOf(args.options.latestTLSVersion.toLowerCase()) === -1) {
             return `${args.options.latestTLSVersion} is not a valid TLS version. Allowed values are ${this.allowedTlsVersions.join(', ')}`;
         }
-        if (args.options.includeResourceData && !args.options.encryptionCertificate) {
+        const shouldIncludeResourceData = args.options.includeResourceData || args.options.withResourceData;
+        if (shouldIncludeResourceData && !args.options.encryptionCertificate) {
             return `The 'encryptionCertificate' options is required to include the changed resource data`;
         }
-        if (args.options.includeResourceData && !args.options.encryptionCertificateId) {
+        if (shouldIncludeResourceData && !args.options.encryptionCertificateId) {
             return `The 'encryptionCertificateId' options is required to include the changed resource data`;
         }
         if (args.options.notificationUrlAppId && !validation.isValidGuid(args.options.notificationUrlAppId)) {

package/dist/m365/graph/commands.js

@@ -3,6 +3,7 @@ export default {
     CHANGELOG_LIST: `${prefix} changelog list`,
     DIRECTORYEXTENSION_ADD: `${prefix} directoryextension add`,
     DIRECTORYEXTENSION_GET: `${prefix} directoryextension get`,
+    DIRECTORYEXTENSION_LIST: `${prefix} directoryextension list`,
     DIRECTORYEXTENSION_REMOVE: `${prefix} directoryextension remove`,
     OPENEXTENSION_ADD: `${prefix} openextension add`,
     OPENEXTENSION_GET: `${prefix} openextension get`,

package/dist/m365/pp/commands/solution/solution-publisher-list.js

@@ -25,13 +25,17 @@ class PpSolutionPublisherListCommand extends PowerPlatformCommand {
         __classPrivateFieldGet(this, _PpSolutionPublisherListCommand_instances, "m", _PpSolutionPublisherListCommand_initOptions).call(this);
     }
     async commandAction(logger, args) {
+        if (args.options.includeMicrosoftPublishers) {
+            await this.warn(logger, `Parameter 'includeMicrosoftPublishers' is deprecated. Please use 'withMicrosoftPublishers' instead`);
+        }
         if (this.verbose) {
             await logger.logToStderr(`Retrieving list of publishers...`);
         }
         try {
             const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
+            const shouldIncludeMicrosoftPublishers = args.options.withMicrosoftPublishers || args.options.includeMicrosoftPublishers;
             const requestOptions = {
-                url: `${dynamicsApiUrl}/api/data/v9.0/publishers?$select=publisherid,uniquename,friendlyname,versionnumber,isreadonly,description,customizationprefix,customizationoptionvalueprefix${!args.options.includeMicrosoftPublishers ? `&$filter=publisherid ne 'd21aab70-79e7-11dd-8874-00188b01e34f'` : ''}&api-version=9.1`,
+                url: `${dynamicsApiUrl}/api/data/v9.0/publishers?$select=publisherid,uniquename,friendlyname,versionnumber,isreadonly,description,customizationprefix,customizationoptionvalueprefix${!shouldIncludeMicrosoftPublishers ? `&$filter=publisherid ne 'd21aab70-79e7-11dd-8874-00188b01e34f'` : ''}&api-version=9.1`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -49,6 +53,7 @@ _PpSolutionPublisherListCommand_instances = new WeakSet(), _PpSolutionPublisherL
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             includeMicrosoftPublishers: typeof args.options.includeMicrosoftPublishers !== 'undefined',
+            withMicrosoftPublishers: typeof args.options.withMicrosoftPublishers !== 'undefined',
             asAdmin: !!args.options.asAdmin
         });
     });
@@ -57,6 +62,8 @@ _PpSolutionPublisherListCommand_instances = new WeakSet(), _PpSolutionPublisherL
         option: '-e, --environmentName <environmentName>'
     }, {
         option: '--includeMicrosoftPublishers'
+    }, {
+        option: '--withMicrosoftPublishers'
     }, {
         option: '--asAdmin'
     });

package/dist/m365/purview/commands/threatassessment/threatassessment-get.js

@@ -24,11 +24,15 @@ class PurviewThreatAssessmentGetCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
+            if (args.options.includeResults) {
+                await this.warn(logger, `Parameter 'includeResults' is deprecated. Please use 'withResults' instead`);
+            }
             if (this.verbose) {
                 await logger.logToStderr(`Retrieving threat assessment with id ${args.options.id}`);
             }
+            const shouldIncludeResults = args.options.includeResults || args.options.withResults;
             const requestOptions = {
-                url: `${this.resource}/v1.0/informationProtection/threatAssessmentRequests/${args.options.id}${args.options.includeResults ? '?$expand=results' : ''}`,
+                url: `${this.resource}/v1.0/informationProtection/threatAssessmentRequests/${args.options.id}${shouldIncludeResults ? '?$expand=results' : ''}`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -45,7 +49,8 @@ class PurviewThreatAssessmentGetCommand extends GraphCommand {
 _PurviewThreatAssessmentGetCommand_instances = new WeakSet(), _PurviewThreatAssessmentGetCommand_initTelemetry = function _PurviewThreatAssessmentGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            includeResults: !!args.options.includeResults
+            includeResults: !!args.options.includeResults,
+            withResults: !!args.options.withResults
         });
     });
 }, _PurviewThreatAssessmentGetCommand_initOptions = function _PurviewThreatAssessmentGetCommand_initOptions() {
@@ -53,6 +58,8 @@ _PurviewThreatAssessmentGetCommand_instances = new WeakSet(), _PurviewThreatAsse
         option: '-i, --id <id>'
     }, {
         option: '--includeResults'
+    }, {
+        option: '--withResults'
     });
 }, _PurviewThreatAssessmentGetCommand_initValidators = function _PurviewThreatAssessmentGetCommand_initValidators() {
     this.validators.push(async (args) => {

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/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/list/list-get.js

@@ -43,6 +43,9 @@ class SpoListGetCommand extends SpoCommand {
             const listServerRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
             requestUrl += `GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
         }
+        else if (args.options.default) {
+            requestUrl += `DefaultDocumentLibrary`;
+        }
         const fieldsProperties = this.formatSelectProperties(args.options.properties, args.options.withPermissions);
         const queryParams = [];
         if (fieldsProperties.selectProperties.length > 0) {
@@ -113,11 +116,12 @@ class SpoListGetCommand extends SpoCommand {
 _SpoListGetCommand_instances = new WeakSet(), _SpoListGetCommand_initTelemetry = function _SpoListGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            title: (!(!args.options.title)).toString(),
-            url: (!(!args.options.url)).toString(),
-            properties: (!(!args.options.properties)).toString(),
-            withPermissions: typeof args.options.withPermissions !== 'undefined'
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
+            url: typeof args.options.url !== 'undefined',
+            properties: typeof args.options.properties !== 'undefined',
+            withPermissions: !!args.options.withPermissions,
+            default: !!args.options.default
         });
     });
 }, _SpoListGetCommand_initOptions = function _SpoListGetCommand_initOptions() {
@@ -129,6 +133,8 @@ _SpoListGetCommand_instances = new WeakSet(), _SpoListGetCommand_initTelemetry =
         option: '-t, --title [title]'
     }, {
         option: '--url [url]'
+    }, {
+        option: '--default'
     }, {
         option: '-p, --properties [properties]'
     }, {
@@ -148,7 +154,7 @@ _SpoListGetCommand_instances = new WeakSet(), _SpoListGetCommand_initTelemetry =
         return true;
     });
 }, _SpoListGetCommand_initOptionSets = function _SpoListGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title', 'url'] });
+    this.optionSets.push({ options: ['id', 'title', 'url', 'default'] });
 };
 export default new SpoListGetCommand();
 //# sourceMappingURL=list-get.js.map

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 = [];