@pnp/cli-microsoft365 12.0.0-beta.1752794 → 12.0.0-beta.445fe0a

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

@@ -1,139 +1,78 @@
-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 _SpoNavigationNodeSetCommand_instances, _SpoNavigationNodeSetCommand_initTelemetry, _SpoNavigationNodeSetCommand_initTypes, _SpoNavigationNodeSetCommand_initOptions, _SpoNavigationNodeSetCommand_initValidators;
-import request from '../../../../request.js';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { spo } from '../../../../utils/spo.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.string().pipe(z.enum(['QuickLaunch', 'TopNavigationBar'])).alias('l'),
+    id: z.int().positive(),
+    title: z.string().min(1, 'Cannot be empty.').optional(),
+    url: z.string().optional(),
+    audienceIds: z.string()
+        .refine(audienceIds => audienceIds === '' || audienceIds.split(',').length <= 10, {
+        error: 'The maximum amount of audienceIds per navigation node exceeded. The maximum amount of audienceIds is 10.'
+    })
+        .refine(audienceIds => audienceIds === '' || validation.isValidGuidArray(audienceIds) === true, {
+        error: e => `The following GUIDs are invalid for the option 'audienceIds': ${validation.isValidGuidArray(e.input)}.`
+    })
+        .optional(),
+    openInNewWindow: z.boolean().optional()
+});
 class SpoNavigationNodeSetCommand extends SpoCommand {
     get name() {
         return commands.NAVIGATION_NODE_SET;
     }
     get description() {
-        return 'Adds a navigation node to the specified site navigation';
+        return 'Updates a SharePoint navigation node';
     }
-    constructor() {
-        super();
-        _SpoNavigationNodeSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoNavigationNodeSetCommand_instances, "m", _SpoNavigationNodeSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoNavigationNodeSetCommand_instances, "m", _SpoNavigationNodeSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoNavigationNodeSetCommand_instances, "m", _SpoNavigationNodeSetCommand_initTypes).call(this);
-        __classPrivateFieldGet(this, _SpoNavigationNodeSetCommand_instances, "m", _SpoNavigationNodeSetCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.title, options.url, options.audienceIds, options.openInNewWindow].some(o => o !== undefined), {
+            error: 'Specify at least one property to update.',
+            params: {
+                customCode: 'optionSet',
+                options: ['title', 'url', 'audienceIds', 'openInNewWindow']
+            }
+        });
+    }
+    getExcludedOptionsWithUrls() {
+        return ['url'];
     }
     async commandAction(logger, args) {
+        const { webUrl, location, id, title, url, audienceIds, openInNewWindow } = args.options;
+        if (this.verbose) {
+            await logger.logToStderr(`Updating navigation node with id ${id}...`);
+        }
         try {
-            if (this.verbose) {
-                await logger.logToStderr(`Setting navigation node...`);
-            }
-            let url = args.options.url;
-            if (url === '') {
-                url = 'http://linkless.header/';
+            const { menuState, node } = await spo.getMenuStateNodeByKey(webUrl, id.toString(), location);
+            if (title !== undefined) {
+                node.Title = title;
             }
-            const requestBody = {
-                Title: args.options.title,
-                IsExternal: args.options.isExternal,
-                Url: url
-            };
-            if (args.options.audienceIds !== undefined) {
-                requestBody.AudienceIds = args.options.audienceIds === '' ? [] : args.options.audienceIds.split(',');
+            if (url !== undefined) {
+                node.SimpleUrl = url;
             }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/navigation/GetNodeById(${args.options.id})`,
-                headers: {
-                    accept: 'application/json;odata=nometadata',
-                    'content-type': 'application/json;odata=nometadata'
-                },
-                data: requestBody,
-                responseType: 'json'
-            };
-            const response = await request.patch(requestOptions);
-            if (response['odata.null'] === true) {
-                throw `Navigation node does not exist.`;
+            if (audienceIds !== undefined) {
+                node.AudienceIds = audienceIds === '' ? [] : audienceIds.split(',');
             }
-            if (args.options.openInNewWindow !== undefined) {
-                if (this.verbose) {
-                    await logger.logToStderr(`Making sure that the navigation node opens in a new window.`);
-                }
-                let menuState = await spo.getQuickLaunchMenuState(args.options.webUrl);
-                let menuStateItem = this.getMenuStateNode(menuState.Nodes, args.options.id);
-                if (!menuStateItem) {
-                    menuState = await spo.getTopNavigationMenuState(args.options.webUrl);
-                    menuStateItem = this.getMenuStateNode(menuState.Nodes, args.options.id);
-                }
-                menuStateItem.OpenInNewWindow = args.options.openInNewWindow;
-                await spo.saveMenuState(args.options.webUrl, menuState);
+            if (openInNewWindow !== undefined) {
+                node.OpenInNewWindow = openInNewWindow;
             }
+            await spo.saveMenuState(webUrl, menuState);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    getMenuStateNode(nodes, id) {
-        let menuNode = nodes.find((node) => node.Key.toString() === id.toString());
-        if (menuNode === undefined) {
-            for (const node of nodes.filter(node => node.Nodes.length > 0)) {
-                menuNode = this.getMenuStateNode(node.Nodes, id);
-                if (menuNode) {
-                    break;
-                }
-            }
-        }
-        return menuNode;
-    }
 }
-_SpoNavigationNodeSetCommand_instances = new WeakSet(), _SpoNavigationNodeSetCommand_initTelemetry = function _SpoNavigationNodeSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            title: typeof args.options.title !== 'undefined',
-            url: typeof args.options.url !== 'undefined',
-            isExternal: typeof args.options.isExternal !== 'undefined',
-            audienceIds: typeof args.options.audienceIds !== 'undefined',
-            openInNewWindow: typeof args.options.openInNewWindow !== 'undefined'
-        });
-    });
-}, _SpoNavigationNodeSetCommand_initTypes = function _SpoNavigationNodeSetCommand_initTypes() {
-    this.types.boolean.push('isExternal');
-}, _SpoNavigationNodeSetCommand_initOptions = function _SpoNavigationNodeSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--id <id>'
-    }, {
-        option: '--title [title]'
-    }, {
-        option: '--url [url]'
-    }, {
-        option: '--audienceIds [audienceIds]'
-    }, {
-        option: '--isExternal [isExternal]'
-    }, {
-        option: '--openInNewWindow [openInNewWindow]'
-    });
-}, _SpoNavigationNodeSetCommand_initValidators = function _SpoNavigationNodeSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        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(',');
-            if (audienceIdsSplitted.length > 10) {
-                return 'The maximum amount of audienceIds per navigation node exceeded. The maximum amount of audienceIds is 10.';
-            }
-            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.audienceIds);
-            if (isValidGUIDArrayResult !== true) {
-                return `The following GUIDs are invalid for the option 'audienceIds': ${isValidGUIDArrayResult}.`;
-            }
-        }
-        return true;
-    });
-};
 export default new SpoNavigationNodeSetCommand();
 //# sourceMappingURL=navigation-node-set.js.map

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

@@ -1,15 +1,22 @@
-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 _SpoOrgAssetsLibraryAddCommand_instances, _a, _SpoOrgAssetsLibraryAddCommand_initTelemetry, _SpoOrgAssetsLibraryAddCommand_initOptions, _SpoOrgAssetsLibraryAddCommand_initValidators;
+import { z } from 'zod';
 import config from '../../../../config.js';
+import { globalOptionsZod } from '../../../../Command.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';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    libraryUrl: z.string().refine(val => validation.isValidSharePointUrl(val) === true, {
+        message: 'The value of the libraryUrl is not a valid SharePoint Online site URL.'
+    }),
+    thumbnailUrl: z.string().refine(val => validation.isValidSharePointUrl(val) === true, {
+        message: 'The value of the thumbnailUrl is not a valid SharePoint Online site URL.'
+    }).optional(),
+    cdnType: z.enum(['Public', 'Private']).optional(),
+    orgAssetType: z.enum(['ImageDocumentLibrary', 'OfficeTemplateLibrary', 'OfficeFontLibrary']).optional()
+});
 var OrgAssetType;
 (function (OrgAssetType) {
     OrgAssetType[OrgAssetType["ImageDocumentLibrary"] = 1] = "ImageDocumentLibrary";
@@ -23,12 +30,8 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand {
     get description() {
         return 'Promotes an existing library to become an organization assets library';
     }
-    constructor() {
-        super();
-        _SpoOrgAssetsLibraryAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoOrgAssetsLibraryAddCommand_instances, "m", _SpoOrgAssetsLibraryAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoOrgAssetsLibraryAddCommand_instances, "m", _SpoOrgAssetsLibraryAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoOrgAssetsLibraryAddCommand_instances, "m", _SpoOrgAssetsLibraryAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const cdnTypeString = args.options.cdnType || 'Private';
@@ -67,42 +70,5 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand {
         }
     }
 }
-_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',
-            orgAssetType: args.options.orgAssetType
-        });
-    });
-}, _SpoOrgAssetsLibraryAddCommand_initOptions = function _SpoOrgAssetsLibraryAddCommand_initOptions() {
-    this.options.unshift({
-        option: '--libraryUrl <libraryUrl>'
-    }, {
-        option: '--thumbnailUrl [thumbnailUrl]'
-    }, {
-        option: '--cdnType [cdnType]',
-        autocomplete: _a.cdnTypes
-    }, {
-        option: '--orgAssetType [orgAssetType]',
-        autocomplete: _a.orgAssetTypes
-    });
-}, _SpoOrgAssetsLibraryAddCommand_initValidators = function _SpoOrgAssetsLibraryAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidThumbnailUrl = validation.isValidSharePointUrl(args.options.thumbnailUrl);
-        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/orgassetslibrary/orgassetslibrary-list.js

@@ -1,8 +1,10 @@
 import config from '../../../../config.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = globalOptionsZod.strict();
 class SpoOrgAssetsLibraryListCommand extends SpoCommand {
     get name() {
         return commands.ORGASSETSLIBRARY_LIST;
@@ -10,6 +12,9 @@ class SpoOrgAssetsLibraryListCommand extends SpoCommand {
     get description() {
         return 'Lists all libraries that are assigned as asset library';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         try {
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
@@ -30,7 +35,7 @@ class SpoOrgAssetsLibraryListCommand extends SpoCommand {
             else {
                 const orgAssetsResponse = json[json.length - 1];
                 if (orgAssetsResponse === null || orgAssetsResponse.OrgAssetsLibraries === undefined) {
-                    await logger.log("No libraries in Organization Assets");
+                    await logger.log([]);
                 }
                 else {
                     const orgAssets = {

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

@@ -1,15 +1,16 @@
-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 _SpoOrgAssetsLibraryRemoveCommand_instances, _SpoOrgAssetsLibraryRemoveCommand_initOptions;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    libraryUrl: z.string(),
+    force: z.boolean().optional().alias('f')
+});
 class SpoOrgAssetsLibraryRemoveCommand extends SpoCommand {
     get name() {
         return commands.ORGASSETSLIBRARY_REMOVE;
@@ -17,10 +18,8 @@ class SpoOrgAssetsLibraryRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes a library that was designated as a central location for organization assets across the tenant.';
     }
-    constructor() {
-        super();
-        _SpoOrgAssetsLibraryRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoOrgAssetsLibraryRemoveCommand_instances, "m", _SpoOrgAssetsLibraryRemoveCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -59,12 +58,5 @@ class SpoOrgAssetsLibraryRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoOrgAssetsLibraryRemoveCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryRemoveCommand_initOptions = function _SpoOrgAssetsLibraryRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '--libraryUrl <libraryUrl>'
-    }, {
-        option: '-f, --force'
-    });
-};
 export default new SpoOrgAssetsLibraryRemoveCommand();
 //# sourceMappingURL=orgassetslibrary-remove.js.map

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

@@ -1,8 +1,10 @@
 import config from '../../../../config.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = globalOptionsZod.strict();
 class SpoOrgNewsSiteListCommand extends SpoCommand {
     get name() {
         return commands.ORGNEWSSITE_LIST;
@@ -10,6 +12,9 @@ class SpoOrgNewsSiteListCommand extends SpoCommand {
     get description() {
         return 'Lists all organizational news sites';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         try {
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);

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

@@ -1,17 +1,20 @@
-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 _SpoOrgNewsSiteRemoveCommand_instances, _SpoOrgNewsSiteRemoveCommand_initTelemetry, _SpoOrgNewsSiteRemoveCommand_initOptions, _SpoOrgNewsSiteRemoveCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
+import { globalOptionsZod } from '../../../../Command.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';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    url: z.string().refine(val => validation.isValidSharePointUrl(val) === true, {
+        message: 'The value of the url is not a valid SharePoint Online site URL.'
+    }).alias('u'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoOrgNewsSiteRemoveCommand extends SpoCommand {
     get name() {
         return commands.ORGNEWSSITE_REMOVE;
@@ -19,12 +22,8 @@ class SpoOrgNewsSiteRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes a site from the list of organizational news sites';
     }
-    constructor() {
-        super();
-        _SpoOrgNewsSiteRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoOrgNewsSiteRemoveCommand_instances, "m", _SpoOrgNewsSiteRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoOrgNewsSiteRemoveCommand_instances, "m", _SpoOrgNewsSiteRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoOrgNewsSiteRemoveCommand_instances, "m", _SpoOrgNewsSiteRemoveCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -60,20 +59,5 @@ class SpoOrgNewsSiteRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoOrgNewsSiteRemoveCommand_instances = new WeakSet(), _SpoOrgNewsSiteRemoveCommand_initTelemetry = function _SpoOrgNewsSiteRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _SpoOrgNewsSiteRemoveCommand_initOptions = function _SpoOrgNewsSiteRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --url <url>'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoOrgNewsSiteRemoveCommand_initValidators = function _SpoOrgNewsSiteRemoveCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.url));
-};
 export default new SpoOrgNewsSiteRemoveCommand();
 //# sourceMappingURL=orgnewssite-remove.js.map

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

@@ -1,16 +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 _SpoOrgNewsSiteSetCommand_instances, _SpoOrgNewsSiteSetCommand_initOptions, _SpoOrgNewsSiteSetCommand_initValidators;
+import { z } from 'zod';
 import config from '../../../../config.js';
+import { globalOptionsZod } from '../../../../Command.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';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    url: z.string().refine(val => validation.isValidSharePointUrl(val) === true, {
+        message: 'The value of the url is not a valid SharePoint Online site URL.'
+    }).alias('u')
+});
 class SpoOrgNewsSiteSetCommand extends SpoCommand {
     get name() {
         return commands.ORGNEWSSITE_SET;
@@ -18,11 +20,8 @@ class SpoOrgNewsSiteSetCommand extends SpoCommand {
     get description() {
         return 'Marks site as an organizational news site';
     }
-    constructor() {
-        super();
-        _SpoOrgNewsSiteSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoOrgNewsSiteSetCommand_instances, "m", _SpoOrgNewsSiteSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoOrgNewsSiteSetCommand_instances, "m", _SpoOrgNewsSiteSetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -47,12 +46,5 @@ class SpoOrgNewsSiteSetCommand extends SpoCommand {
         }
     }
 }
-_SpoOrgNewsSiteSetCommand_instances = new WeakSet(), _SpoOrgNewsSiteSetCommand_initOptions = function _SpoOrgNewsSiteSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --url <url>'
-    });
-}, _SpoOrgNewsSiteSetCommand_initValidators = function _SpoOrgNewsSiteSetCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.url));
-};
 export default new SpoOrgNewsSiteSetCommand();
 //# sourceMappingURL=orgnewssite-set.js.map

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

@@ -27,14 +27,13 @@ class SpoPageColumnListCommand extends SpoCommand {
             const clientSidePage = await Page.getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose);
             const sections = clientSidePage.sections
                 .filter(section => section.order === args.options.section);
-            if (sections.length) {
-                const isJSONOutput = !cli.shouldTrimOutput(args.options.output);
-                await logger.log(sections[0].columns.map(c => {
-                    const column = Page.getColumnsInformation(c, isJSONOutput);
-                    column.controls = c.controls.length;
-                    return column;
-                }));
-            }
+            const isJSONOutput = !cli.shouldTrimOutput(args.options.output);
+            const columns = sections[0]?.columns ?? [];
+            await logger.log(columns.map(c => {
+                const column = Page.getColumnsInformation(c, isJSONOutput);
+                column.controls = c.controls.length;
+                return column;
+            }));
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -27,23 +27,21 @@ class SpoPageSectionListCommand extends SpoCommand {
             const clientSidePage = await Page.getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose);
             const sections = clientSidePage.sections;
             const isJSONOutput = !cli.shouldTrimOutput(args.options.output);
-            if (sections.length) {
-                const output = sections.map(section => Page.getSectionInformation(section, isJSONOutput));
-                if (isJSONOutput) {
-                    await logger.log(output);
-                }
-                else {
-                    await logger.log(output.map(s => {
-                        const sectionOutput = {
-                            order: s.order,
-                            columns: s.columns.length
-                        };
-                        if (s.isVertical) {
-                            sectionOutput.isVertical = s.isVertical;
-                        }
-                        return sectionOutput;
-                    }));
-                }
+            const output = sections.map(section => Page.getSectionInformation(section, isJSONOutput));
+            if (isJSONOutput) {
+                await logger.log(output);
+            }
+            else {
+                await logger.log(output.map(s => {
+                    const sectionOutput = {
+                        order: s.order,
+                        columns: s.columns.length
+                    };
+                    if (s.isVertical) {
+                        sectionOutput.isVertical = s.isVertical;
+                    }
+                    return sectionOutput;
+                }));
             }
         }
         catch (err) {

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

@@ -0,0 +1,53 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { urlUtil } from '../../../../utils/urlUtil.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'),
+    name: z.string().alias('n')
+});
+class SpoPageUnpublishCommand extends SpoCommand {
+    get name() {
+        return commands.PAGE_UNPUBLISH;
+    }
+    get description() {
+        return 'Unpublishes a modern page';
+    }
+    get schema() {
+        return options;
+    }
+    async commandAction(logger, args) {
+        try {
+            let pageName = urlUtil.removeLeadingSlashes(args.options.name);
+            if (!pageName.toLowerCase().endsWith('.aspx')) {
+                pageName += '.aspx';
+            }
+            if (this.verbose) {
+                await logger.logToStderr(`Unpublishing page ${pageName}...`);
+            }
+            const filePath = `${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/SitePages/${pageName}`;
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(filePath)}')/UnPublish`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new SpoPageUnpublishCommand();
+//# sourceMappingURL=page-unpublish.js.map