@pnp/cli-microsoft365 12.0.0-beta.10c5833 → 12.0.0-beta.4ac11a7

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

@@ -1,16 +1,21 @@
-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 _SpoHubSiteSetCommand_instances, _SpoHubSiteSetCommand_initTelemetry, _SpoHubSiteSetCommand_initOptions, _SpoHubSiteSetCommand_initValidators, _SpoHubSiteSetCommand_initTypes;
+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,
+    id: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} is not a valid GUID`
+    }).alias('i'),
+    title: z.string().optional().alias('t'),
+    description: z.string().optional().alias('d'),
+    logoUrl: z.string().optional().alias('l')
+});
 class SpoHubSiteSetCommand extends SpoCommand {
     get name() {
         return commands.HUBSITE_SET;
@@ -18,13 +23,14 @@ class SpoHubSiteSetCommand extends SpoCommand {
     get description() {
         return 'Updates properties of the specified hub site';
     }
-    constructor() {
-        super();
-        _SpoHubSiteSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoHubSiteSetCommand_instances, "m", _SpoHubSiteSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteSetCommand_instances, "m", _SpoHubSiteSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteSetCommand_instances, "m", _SpoHubSiteSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteSetCommand_instances, "m", _SpoHubSiteSetCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => opts.title !== undefined || opts.description !== undefined || opts.logoUrl !== undefined, {
+            error: 'Specify title, description or logoUrl to update'
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -62,38 +68,5 @@ class SpoHubSiteSetCommand extends SpoCommand {
         }
     }
 }
-_SpoHubSiteSetCommand_instances = new WeakSet(), _SpoHubSiteSetCommand_initTelemetry = function _SpoHubSiteSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            title: typeof args.options.title === 'string',
-            description: typeof args.options.description === 'string',
-            logoUrl: typeof args.options.logoUrl === 'string'
-        });
-    });
-}, _SpoHubSiteSetCommand_initOptions = function _SpoHubSiteSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '-l, --logoUrl [logoUrl]'
-    });
-}, _SpoHubSiteSetCommand_initValidators = function _SpoHubSiteSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (!args.options.title &&
-            !args.options.description &&
-            !args.options.logoUrl) {
-            return 'Specify title, description or logoUrl to update';
-        }
-        return true;
-    });
-}, _SpoHubSiteSetCommand_initTypes = function _SpoHubSiteSetCommand_initTypes() {
-    this.types.string.push('t', 'title', 'd', 'description', 'l', 'logoUrl');
-};
 export default new SpoHubSiteSetCommand();
 //# sourceMappingURL=hubsite-set.js.map

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

@@ -1,15 +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 _SpoHubSiteUnregisterCommand_instances, _SpoHubSiteUnregisterCommand_initTelemetry, _SpoHubSiteUnregisterCommand_initOptions, _SpoHubSiteUnregisterCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.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,
+    url: z.string().refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoHubSiteUnregisterCommand extends SpoCommand {
     get name() {
         return commands.HUBSITE_UNREGISTER;
@@ -17,12 +20,8 @@ class SpoHubSiteUnregisterCommand extends SpoCommand {
     get description() {
         return 'Unregisters the specified site collection as a hub site';
     }
-    constructor() {
-        super();
-        _SpoHubSiteUnregisterCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoHubSiteUnregisterCommand_instances, "m", _SpoHubSiteUnregisterCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteUnregisterCommand_instances, "m", _SpoHubSiteUnregisterCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteUnregisterCommand_instances, "m", _SpoHubSiteUnregisterCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const unregisterHubSite = async () => {
@@ -56,20 +55,5 @@ class SpoHubSiteUnregisterCommand extends SpoCommand {
         }
     }
 }
-_SpoHubSiteUnregisterCommand_instances = new WeakSet(), _SpoHubSiteUnregisterCommand_initTelemetry = function _SpoHubSiteUnregisterCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: args.options.force || false
-        });
-    });
-}, _SpoHubSiteUnregisterCommand_initOptions = function _SpoHubSiteUnregisterCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --url <url>'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoHubSiteUnregisterCommand_initValidators = function _SpoHubSiteUnregisterCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.url));
-};
 export default new SpoHubSiteUnregisterCommand();
 //# sourceMappingURL=hubsite-unregister.js.map

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

@@ -11,9 +11,6 @@ import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 class SpoListItemGetCommand extends SpoCommand {
-    allowUnknownOptions() {
-        return true;
-    }
     get name() {
         return commands.LISTITEM_GET;
     }
@@ -30,12 +27,6 @@ class SpoListItemGetCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoListItemGetCommand_instances, "m", _SpoListItemGetCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        if (args.options.properties) {
-            await this.warn(logger, `Option 'properties' is deprecated. Please use 'fields' instead.`);
-            if (!args.options.fields) {
-                args.options.fields = args.options.properties;
-            }
-        }
         let requestUrl = `${args.options.webUrl}/_api/web`;
         if (args.options.listId) {
             requestUrl += `/lists(guid'${formatting.encodeQueryParameter(args.options.listId)}')`;
@@ -109,8 +100,6 @@ _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTel
         option: '--listUrl [listUrl]'
     }, {
         option: '--fields [fields]'
-    }, {
-        option: '-p, --properties [properties]'
     }, {
         option: '--withPermissions'
     });
@@ -135,7 +124,7 @@ _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTel
         return true;
     });
 }, _SpoListItemGetCommand_initTypes = function _SpoListItemGetCommand_initTypes() {
-    this.types.string.push('webUrl', 'listId', 'listTitle', 'id', 'uniqueId', 'fields', 'properties');
+    this.types.string.push('webUrl', 'listId', 'listTitle', 'id', 'uniqueId', 'fields');
 }, _SpoListItemGetCommand_initOptionSets = function _SpoListItemGetCommand_initOptionSets() {
     this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['id', 'uniqueId'] });
 };

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

@@ -1,14 +1,30 @@
-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 _SpoNavigationNodeAddCommand_instances, _SpoNavigationNodeAddCommand_initTelemetry, _SpoNavigationNodeAddCommand_initOptions, _SpoNavigationNodeAddCommand_initValidators, _SpoNavigationNodeAddCommand_initOptionSets;
-import request from '../../../../request.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
 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.enum(['QuickLaunch', 'TopNavigationBar']).optional().alias('l'),
+    title: z.string().min(1, 'Cannot be empty.').alias('t'),
+    url: z.string().optional(),
+    parentNodeId: z.int().positive().optional(),
+    audienceIds: z.string()
+        .refine(audienceIds => audienceIds.split(',').length <= 10, {
+        error: 'The maximum amount of audienceIds per navigation node exceeded. The maximum amount of audienceIds is 10.'
+    })
+        .refine(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 SpoNavigationNodeAddCommand extends SpoCommand {
     get name() {
         return commands.NAVIGATION_NODE_ADD;
@@ -16,134 +32,72 @@ class SpoNavigationNodeAddCommand extends SpoCommand {
     get description() {
         return 'Adds a navigation node to the specified site navigation';
     }
-    constructor() {
-        super();
-        _SpoNavigationNodeAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoNavigationNodeAddCommand_instances, "m", _SpoNavigationNodeAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoNavigationNodeAddCommand_instances, "m", _SpoNavigationNodeAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoNavigationNodeAddCommand_instances, "m", _SpoNavigationNodeAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoNavigationNodeAddCommand_instances, "m", _SpoNavigationNodeAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.location, options.parentNodeId].filter(o => o !== undefined).length === 1, {
+            error: `Specify either 'location' or 'parentNodeId', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['location', 'parentNodeId']
+            }
+        });
     }
     getExcludedOptionsWithUrls() {
         return ['url'];
     }
     async commandAction(logger, args) {
+        const { webUrl, location, parentNodeId, title, url, audienceIds, openInNewWindow } = args.options;
         if (this.verbose) {
             await logger.logToStderr(`Adding navigation node...`);
         }
-        const nodesCollection = args.options.parentNodeId ?
-            `GetNodeById(${args.options.parentNodeId})/Children` :
-            args.options.location.toLowerCase();
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/navigation/${nodesCollection}`,
-            headers: {
-                accept: 'application/json;odata=nometadata',
-                'content-type': 'application/json;odata=nometadata'
-            },
-            responseType: 'json',
-            data: {
-                AudienceIds: args.options.audienceIds?.split(','),
-                Title: args.options.title,
-                Url: args.options.url ?? 'http://linkless.header/',
-                IsExternal: args.options.isExternal === true
-            }
-        };
         try {
-            const res = await request.post(requestOptions);
-            if (args.options.openInNewWindow) {
-                if (this.verbose) {
-                    await logger.logToStderr(`Making sure that the newly added navigation node opens in a new window.`);
-                }
-                const id = res.Id.toString();
-                let menuState = args.options.location === 'TopNavigationBar' ? await spo.getTopNavigationMenuState(args.options.webUrl) : await spo.getQuickLaunchMenuState(args.options.webUrl);
-                let menuStateItem = this.getMenuStateNode(menuState.Nodes, id);
-                if (args.options.parentNodeId && !menuStateItem) {
-                    menuState = await spo.getTopNavigationMenuState(args.options.webUrl);
-                    menuStateItem = this.getMenuStateNode(menuState.Nodes, id);
-                }
-                menuStateItem.OpenInNewWindow = true;
-                await spo.saveMenuState(args.options.webUrl, menuState);
+            let menuState;
+            let siblingNodes;
+            if (parentNodeId) {
+                const parent = await spo.getMenuStateNodeByKey(webUrl, parentNodeId.toString());
+                menuState = parent.menuState;
+                siblingNodes = parent.node.Nodes;
+            }
+            else {
+                menuState = location === 'TopNavigationBar'
+                    ? await spo.getTopNavigationMenuState(webUrl)
+                    : await spo.getQuickLaunchMenuState(webUrl);
+                siblingNodes = menuState.Nodes;
             }
-            await logger.log(res);
+            const existingKeys = siblingNodes.map(node => node.Key);
+            const newNode = {
+                AudienceIds: audienceIds ? audienceIds.split(',') : [],
+                IsDeleted: false,
+                IsHidden: false,
+                Key: null,
+                Nodes: [],
+                NodeType: 0,
+                OpenInNewWindow: openInNewWindow ? true : null,
+                SimpleUrl: url ?? '',
+                Title: title
+            };
+            siblingNodes.push(newNode);
+            await spo.saveMenuState(webUrl, menuState);
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving the added navigation node...`);
+            }
+            const updatedMenuState = await spo.getMenuState(webUrl, menuState.StartingNodeKey);
+            const updatedSiblingNodes = parentNodeId
+                ? spo.findMenuStateNode(updatedMenuState.Nodes, parentNodeId.toString())?.Nodes
+                : updatedMenuState.Nodes;
+            const addedNode = updatedSiblingNodes?.find(node => !existingKeys.includes(node.Key) && node.Title === title);
+            if (!addedNode) {
+                throw `The navigation node was added, but it couldn't be retrieved.`;
+            }
+            await logger.log(addedNode);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    getMenuStateNode(nodes, id) {
-        let menuNode = nodes.find((node) => node.Key !== null && node.Key === id);
-        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;
-    }
 }
-_SpoNavigationNodeAddCommand_instances = new WeakSet(), _SpoNavigationNodeAddCommand_initTelemetry = function _SpoNavigationNodeAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            isExternal: args.options.isExternal,
-            location: typeof args.options.location !== 'undefined',
-            parentNodeId: typeof args.options.parentNodeId !== 'undefined',
-            audienceIds: typeof args.options.audienceIds !== 'undefined',
-            url: typeof args.options.url !== 'undefined',
-            openInNewWindow: !!args.options.openInNewWindow
-        });
-    });
-}, _SpoNavigationNodeAddCommand_initOptions = function _SpoNavigationNodeAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-l, --location [location]',
-        autocomplete: ['QuickLaunch', 'TopNavigationBar']
-    }, {
-        option: '-t, --title <title>'
-    }, {
-        option: '--url [url]'
-    }, {
-        option: '--parentNodeId [parentNodeId]'
-    }, {
-        option: '--isExternal'
-    }, {
-        option: '--audienceIds [audienceIds]'
-    }, {
-        option: '--openInNewWindow'
-    });
-}, _SpoNavigationNodeAddCommand_initValidators = function _SpoNavigationNodeAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.parentNodeId) {
-            if (isNaN(args.options.parentNodeId)) {
-                return `${args.options.parentNodeId} is not a number`;
-            }
-        }
-        else {
-            if (args.options.location !== 'QuickLaunch' &&
-                args.options.location !== 'TopNavigationBar') {
-                return `${args.options.location} is not a valid value for the location option. Allowed values are QuickLaunch|TopNavigationBar`;
-            }
-        }
-        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 auciendeIds 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;
-    });
-}, _SpoNavigationNodeAddCommand_initOptionSets = function _SpoNavigationNodeAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['location', 'parentNodeId'] });
-};
 export default new SpoNavigationNodeAddCommand();
 //# sourceMappingURL=navigation-node-add.js.map

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

@@ -1,6 +1,6 @@
 import { globalOptionsZod } from '../../../../Command.js';
 import { z } from 'zod';
-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';
@@ -11,6 +11,7 @@ export const options = z.strictObject({
         error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
     })
         .alias('u'),
+    location: z.enum(['QuickLaunch', 'TopNavigationBar']).alias('l'),
     id: z.int().positive()
 });
 class SpoNavigationNodeGetCommand extends SpoCommand {
@@ -27,19 +28,9 @@ class SpoNavigationNodeGetCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving information about navigation node with id ${args.options.id}`);
         }
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/navigation/GetNodeById(${args.options.id})?$expand=Children,Children/Children,Children/Children/Children`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
         try {
-            const listInstance = await request.get(requestOptions);
-            if (listInstance['odata.null']) {
-                throw `No navigation node found with id ${args.options.id}.`;
-            }
-            await logger.log(listInstance);
+            const { node } = await spo.getMenuStateNodeByKey(args.options.webUrl, args.options.id.toString(), args.options.location);
+            await logger.log(node);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -1,6 +1,6 @@
 import { globalOptionsZod } from '../../../../Command.js';
 import { z } from 'zod';
-import { odata } from '../../../../utils/odata.js';
+import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
@@ -21,7 +21,7 @@ class SpoNavigationNodeListCommand extends SpoCommand {
         return 'Lists nodes from the specified site navigation';
     }
     defaultProperties() {
-        return ['Id', 'Title', 'Url'];
+        return ['Key', 'Title', 'SimpleUrl'];
     }
     get schema() {
         return options;
@@ -31,8 +31,10 @@ class SpoNavigationNodeListCommand extends SpoCommand {
             await logger.logToStderr(`Retrieving navigation nodes...`);
         }
         try {
-            const res = await odata.getAllItems(`${args.options.webUrl}/_api/web/navigation/${args.options.location.toLowerCase()}?$expand=Children,Children/Children,Children/Children/Children`);
-            await logger.log(res);
+            const menuState = args.options.location === 'TopNavigationBar'
+                ? await spo.getTopNavigationMenuState(args.options.webUrl)
+                : await spo.getQuickLaunchMenuState(args.options.webUrl);
+            await logger.log(menuState.Nodes);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);