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

package/dist/Auth.js

@@ -606,8 +606,22 @@ export class Auth {
             const federationToken = await this.getFederationTokenFromAzureDevOps(logger, debug, serviceConnectionId);
             return this.getAccessTokenWithFederatedToken(resource, federationToken, logger, debug);
         }
+        else if (process.env.GITLAB_CI) {
+            if (debug) {
+                await logger.logToStderr('GITLAB_CI env variable found. The context is GitLab CI/CD...');
+            }
+            if (!process.env.GITLAB_OIDC_TOKEN) {
+                throw new CommandError('The `GITLAB_OIDC_TOKEN` environment variable is not available. Please add an id_tokens entry named GITLAB_OIDC_TOKEN with audience `api://AzureADTokenExchange` to the job.');
+            }
+            if (!this.connection.appId || this.connection.tenant === 'common') {
+                throw new CommandError('The appId and tenant parameters are required when using federated identity in GitLab CI/CD.');
+            }
+            // GitLab's id_tokens feature mints the OIDC JWT directly into the configured job variable, so no
+            // separate request to GitLab is needed to obtain the federation token before exchanging it with Entra ID.
+            return this.getAccessTokenWithFederatedToken(resource, process.env.GITLAB_OIDC_TOKEN, logger, debug);
+        }
         else {
-            throw new CommandError('Federated identity is currently only supported in GitHub Actions and Azure DevOps.');
+            throw new CommandError('Federated identity is currently only supported in GitHub Actions, Azure DevOps and GitLab.');
         }
     }
     async getFederationTokenFromGithub(logger, debug) {

package/dist/m365/spfx/commands/SpfxCompatibilityMatrix.js

@@ -653,6 +653,21 @@ export const versions = {
             range: '^4 || ^5 || ^6 || ^7',
             fix: 'npm i -g yo@7'
         }
+    },
+    '1.24.0-rc.0': {
+        heft: {
+            range: '^1',
+            fix: 'npm i -g @rushstack/heft@1'
+        },
+        node: {
+            range: '>=22.14.0 <23.0.0 || >=24.0.0 <25.0.0 || >=26.0.0 <27.0.0',
+            fix: 'Install Node.js >=22.14.0 <23.0.0 || >=24.0.0 <25.0.0 || >=26.0.0 <27.0.0'
+        },
+        sp: SharePointVersion.SPO,
+        yo: {
+            range: '^4 || ^5 || ^6 || ^7',
+            fix: 'npm i -g yo@7'
+        }
     }
 };
 //# sourceMappingURL=SpfxCompatibilityMatrix.js.map

package/dist/m365/spfx/commands/project/project-doctor/doctor-1.24.0-rc.0.js

@@ -0,0 +1,19 @@
+import { FN001008_DEP_react } from './rules/FN001008_DEP_react.js';
+import { FN001009_DEP_react_dom } from './rules/FN001009_DEP_react_dom.js';
+import { FN001035_DEP_fluentui_react } from './rules/FN001035_DEP_fluentui_react.js';
+import { FN002013_DEVDEP_types_webpack_env } from './rules/FN002013_DEVDEP_types_webpack_env.js';
+import { FN002015_DEVDEP_types_react } from './rules/FN002015_DEVDEP_types_react.js';
+import { FN002016_DEVDEP_types_react_dom } from './rules/FN002016_DEVDEP_types_react_dom.js';
+import { FN002022_DEVDEP_typescript } from './rules/FN002022_DEVDEP_typescript.js';
+import { FN021001_PKG_spfx_deps_versions_match_project_version } from './rules/FN021001_PKG_spfx_deps_versions_match_project_version.js';
+export default [
+    new FN001008_DEP_react({ supportedRange: '18' }),
+    new FN001009_DEP_react_dom({ supportedRange: '18' }),
+    new FN001035_DEP_fluentui_react({ supportedRange: '^8.106.4' }),
+    new FN002013_DEVDEP_types_webpack_env({ supportedRange: '~1.15.2' }),
+    new FN002015_DEVDEP_types_react({ supportedRange: '18' }),
+    new FN002016_DEVDEP_types_react_dom({ supportedRange: '18' }),
+    new FN002022_DEVDEP_typescript({ supportedRange: '~5.8.0' }),
+    new FN021001_PKG_spfx_deps_versions_match_project_version({ includeDevDeps: true })
+];
+//# sourceMappingURL=doctor-1.24.0-rc.0.js.map

package/dist/m365/spfx/commands/project/project-doctor.js

@@ -78,7 +78,8 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
             '1.22.1',
             '1.22.2',
             '1.23.0',
-            '1.23.2'
+            '1.23.2',
+            '1.24.0-rc.0'
         ];
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);

package/dist/m365/spfx/commands/project/project-upgrade/rules/FN012021_TSC_excludeDirectories.js

@@ -0,0 +1,43 @@
+import { JsonRule } from '../../JsonRule.js';
+export class FN012021_TSC_excludeDirectories extends JsonRule {
+    constructor(options) {
+        super();
+        this.directories = options.directories;
+    }
+    get id() {
+        return 'FN012021';
+    }
+    get title() {
+        return 'tsconfig.json watchOptions.excludeDirectories property';
+    }
+    get description() {
+        return `Update tsconfig.json watchOptions.excludeDirectories property`;
+    }
+    get resolution() {
+        return `{
+  "watchOptions": {
+    "excludeDirectories": ${JSON.stringify(this.directories)}
+  }
+}`;
+    }
+    get resolutionType() {
+        return 'json';
+    }
+    get severity() {
+        return 'Required';
+    }
+    get file() {
+        return './tsconfig.json';
+    }
+    visit(project, findings) {
+        if (!project.tsConfigJson) {
+            return;
+        }
+        if (!project.tsConfigJson.watchOptions?.excludeDirectories ||
+            JSON.stringify(project.tsConfigJson.watchOptions.excludeDirectories) !== JSON.stringify(this.directories)) {
+            const node = this.getAstNodeFromFile(project.tsConfigJson, 'watchOptions.excludeDirectories');
+            this.addFindingWithPosition(findings, node);
+        }
+    }
+}
+//# sourceMappingURL=FN012021_TSC_excludeDirectories.js.map

package/dist/m365/spfx/commands/project/project-upgrade/rules/FN027002_OVERRIDES_qs.js

@@ -0,0 +1,33 @@
+import { DependencyRule } from "./DependencyRule.js";
+export class FN027002_OVERRIDES_qs extends DependencyRule {
+    constructor(options) {
+        super({ packageName: 'qs', packageVersion: options.version, isOverride: true });
+    }
+    get id() {
+        return 'FN027002';
+    }
+    visit(project, findings) {
+        // If an override entry for the package already exists in package.json,
+        // emit an extra finding to remove the existing override first. This avoids
+        // having to use a separate remove-override rule (e.g. FN027002) in the upgrade scripts.
+        if (project.packageJson?.overrides?.[this.packageName] &&
+            project.packageJson.overrides[this.packageName] !== this.packageVersion) {
+            const node = this.getAstNodeFromFile(project.packageJson, `overrides.${this.packageName}`);
+            findings.push({
+                id: `${this.id}_REMOVE`,
+                title: this.packageName,
+                description: `Remove existing SharePoint Framework override dependency package ${this.packageName}`,
+                occurrences: [{
+                        file: this.file,
+                        resolution: `removeOverride overrides.${this.packageName}`,
+                        position: this.getPositionFromNode(node)
+                    }],
+                resolutionType: 'cmd',
+                severity: 'Required',
+                supersedes: []
+            });
+        }
+        super.visit(project, findings);
+    }
+}
+//# sourceMappingURL=FN027002_OVERRIDES_qs.js.map

package/dist/m365/spfx/commands/project/project-upgrade/rules/FN027003_OVERRIDES_uuid.js

@@ -0,0 +1,33 @@
+import { DependencyRule } from "./DependencyRule.js";
+export class FN027003_OVERRIDES_uuid extends DependencyRule {
+    constructor(options) {
+        super({ packageName: 'uuid', packageVersion: options.version, isOverride: true });
+    }
+    get id() {
+        return 'FN027003';
+    }
+    visit(project, findings) {
+        // If an override entry for the package already exists in package.json,
+        // emit an extra finding to remove the existing override first. This avoids
+        // having to use a separate remove-override rule (e.g. FN027003) in the upgrade scripts.
+        if (project.packageJson?.overrides?.[this.packageName] &&
+            project.packageJson.overrides[this.packageName] !== this.packageVersion) {
+            const node = this.getAstNodeFromFile(project.packageJson, `overrides.${this.packageName}`);
+            findings.push({
+                id: `${this.id}_REMOVE`,
+                title: this.packageName,
+                description: `Remove existing SharePoint Framework override dependency package ${this.packageName}`,
+                occurrences: [{
+                        file: this.file,
+                        resolution: `removeOverride overrides.${this.packageName}`,
+                        position: this.getPositionFromNode(node)
+                    }],
+                resolutionType: 'cmd',
+                severity: 'Required',
+                supersedes: []
+            });
+        }
+        super.visit(project, findings);
+    }
+}
+//# sourceMappingURL=FN027003_OVERRIDES_uuid.js.map

package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.24.0-rc.0.js

@@ -0,0 +1,77 @@
+import { FN001001_DEP_microsoft_sp_core_library } from './rules/FN001001_DEP_microsoft_sp_core_library.js';
+import { FN001002_DEP_microsoft_sp_lodash_subset } from './rules/FN001002_DEP_microsoft_sp_lodash_subset.js';
+import { FN001003_DEP_microsoft_sp_office_ui_fabric_core } from './rules/FN001003_DEP_microsoft_sp_office_ui_fabric_core.js';
+import { FN001004_DEP_microsoft_sp_webpart_base } from './rules/FN001004_DEP_microsoft_sp_webpart_base.js';
+import { FN001008_DEP_react } from './rules/FN001008_DEP_react.js';
+import { FN001009_DEP_react_dom } from './rules/FN001009_DEP_react_dom.js';
+import { FN001011_DEP_microsoft_sp_dialog } from './rules/FN001011_DEP_microsoft_sp_dialog.js';
+import { FN001012_DEP_microsoft_sp_application_base } from './rules/FN001012_DEP_microsoft_sp_application_base.js';
+import { FN001013_DEP_microsoft_decorators } from './rules/FN001013_DEP_microsoft_decorators.js';
+import { FN001014_DEP_microsoft_sp_listview_extensibility } from './rules/FN001014_DEP_microsoft_sp_listview_extensibility.js';
+import { FN001021_DEP_microsoft_sp_property_pane } from './rules/FN001021_DEP_microsoft_sp_property_pane.js';
+import { FN001023_DEP_microsoft_sp_component_base } from './rules/FN001023_DEP_microsoft_sp_component_base.js';
+import { FN001024_DEP_microsoft_sp_diagnostics } from './rules/FN001024_DEP_microsoft_sp_diagnostics.js';
+import { FN001025_DEP_microsoft_sp_dynamic_data } from './rules/FN001025_DEP_microsoft_sp_dynamic_data.js';
+import { FN001026_DEP_microsoft_sp_extension_base } from './rules/FN001026_DEP_microsoft_sp_extension_base.js';
+import { FN001027_DEP_microsoft_sp_http } from './rules/FN001027_DEP_microsoft_sp_http.js';
+import { FN001028_DEP_microsoft_sp_list_subscription } from './rules/FN001028_DEP_microsoft_sp_list_subscription.js';
+import { FN001029_DEP_microsoft_sp_loader } from './rules/FN001029_DEP_microsoft_sp_loader.js';
+import { FN001030_DEP_microsoft_sp_module_interfaces } from './rules/FN001030_DEP_microsoft_sp_module_interfaces.js';
+import { FN001031_DEP_microsoft_sp_odata_types } from './rules/FN001031_DEP_microsoft_sp_odata_types.js';
+import { FN001032_DEP_microsoft_sp_page_context } from './rules/FN001032_DEP_microsoft_sp_page_context.js';
+import { FN001034_DEP_microsoft_sp_adaptive_card_extension_base } from './rules/FN001034_DEP_microsoft_sp_adaptive_card_extension_base.js';
+import { FN002002_DEVDEP_microsoft_sp_module_interfaces } from './rules/FN002002_DEVDEP_microsoft_sp_module_interfaces.js';
+import { FN002015_DEVDEP_types_react } from './rules/FN002015_DEVDEP_types_react.js';
+import { FN002016_DEVDEP_types_react_dom } from './rules/FN002016_DEVDEP_types_react_dom.js';
+import { FN002022_DEVDEP_microsoft_eslint_plugin_spfx } from './rules/FN002022_DEVDEP_microsoft_eslint_plugin_spfx.js';
+import { FN002023_DEVDEP_microsoft_eslint_config_spfx } from './rules/FN002023_DEVDEP_microsoft_eslint_config_spfx.js';
+import { FN002030_DEVDEP_microsoft_spfx_web_build_rig } from './rules/FN002030_DEVDEP_microsoft_spfx_web_build_rig.js';
+import { FN002031_DEVDEP_rushstack_heft } from './rules/FN002031_DEVDEP_rushstack_heft.js';
+import { FN002034_DEVDEP_microsoft_spfx_heft_plugins } from './rules/FN002034_DEVDEP_microsoft_spfx_heft_plugins.js';
+import { FN010001_YORC_version } from './rules/FN010001_YORC_version.js';
+import { FN012021_TSC_excludeDirectories } from './rules/FN012021_TSC_excludeDirectories.js';
+import { FN020001_RES_types_react } from './rules/FN020001_RES_types_react.js';
+import { FN021003_PKG_engines_node } from './rules/FN021003_PKG_engines_node.js';
+import { FN027001_OVERRIDES_rushstack_heft } from './rules/FN027001_OVERRIDES_rushstack_heft.js';
+import { FN027002_OVERRIDES_qs } from './rules/FN027002_OVERRIDES_qs.js';
+import { FN027003_OVERRIDES_uuid } from './rules/FN027003_OVERRIDES_uuid.js';
+export default [
+    new FN001001_DEP_microsoft_sp_core_library({ packageVersion: '1.24.0-rc.0' }),
+    new FN001002_DEP_microsoft_sp_lodash_subset({ packageVersion: '1.24.0-rc.0' }),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core({ packageVersion: '1.24.0-rc.0' }),
+    new FN001004_DEP_microsoft_sp_webpart_base({ packageVersion: '1.24.0-rc.0' }),
+    new FN001008_DEP_react({ packageVersion: '18.3.1' }),
+    new FN001009_DEP_react_dom({ packageVersion: '18.3.1' }),
+    new FN001011_DEP_microsoft_sp_dialog({ packageVersion: '1.24.0-rc.0' }),
+    new FN001012_DEP_microsoft_sp_application_base({ packageVersion: '1.24.0-rc.0' }),
+    new FN001014_DEP_microsoft_sp_listview_extensibility({ packageVersion: '1.24.0-rc.0' }),
+    new FN001021_DEP_microsoft_sp_property_pane({ packageVersion: '1.24.0-rc.0' }),
+    new FN001023_DEP_microsoft_sp_component_base({ packageVersion: '1.24.0-rc.0' }),
+    new FN001024_DEP_microsoft_sp_diagnostics({ packageVersion: '1.24.0-rc.0' }),
+    new FN001025_DEP_microsoft_sp_dynamic_data({ packageVersion: '1.24.0-rc.0' }),
+    new FN001026_DEP_microsoft_sp_extension_base({ packageVersion: '1.24.0-rc.0' }),
+    new FN001027_DEP_microsoft_sp_http({ packageVersion: '1.24.0-rc.0' }),
+    new FN001028_DEP_microsoft_sp_list_subscription({ packageVersion: '1.24.0-rc.0' }),
+    new FN001029_DEP_microsoft_sp_loader({ packageVersion: '1.24.0-rc.0' }),
+    new FN001030_DEP_microsoft_sp_module_interfaces({ packageVersion: '1.24.0-rc.0' }),
+    new FN001031_DEP_microsoft_sp_odata_types({ packageVersion: '1.24.0-rc.0' }),
+    new FN001032_DEP_microsoft_sp_page_context({ packageVersion: '1.24.0-rc.0' }),
+    new FN001013_DEP_microsoft_decorators({ packageVersion: '1.24.0-rc.0' }),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base({ packageVersion: '1.24.0-rc.0' }),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces({ packageVersion: '1.24.0-rc.0' }),
+    new FN002015_DEVDEP_types_react({ packageVersion: '18.2.79' }),
+    new FN002016_DEVDEP_types_react_dom({ packageVersion: '18.2.25' }),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx({ packageVersion: '1.24.0-rc.0' }),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx({ packageVersion: '1.24.0-rc.0' }),
+    new FN002030_DEVDEP_microsoft_spfx_web_build_rig({ packageVersion: '1.24.0-rc.0' }),
+    new FN002031_DEVDEP_rushstack_heft({ packageVersion: '1.3.2' }),
+    new FN002034_DEVDEP_microsoft_spfx_heft_plugins({ packageVersion: '1.24.0-rc.0' }),
+    new FN010001_YORC_version({ version: '1.24.0-rc.0' }),
+    new FN012021_TSC_excludeDirectories({ directories: ['**/teams', '**/temp/copilot'] }),
+    new FN020001_RES_types_react({ packageVersion: '18.2.79' }),
+    new FN021003_PKG_engines_node({ version: '>=22.14.0 <23.0.0 || >=24.0.0 <25.0.0 || >=26.0.0 <27.0.0' }),
+    new FN027001_OVERRIDES_rushstack_heft({ version: '1.3.2' }),
+    new FN027002_OVERRIDES_qs({ version: '>=6.15.2' }),
+    new FN027003_OVERRIDES_uuid({ version: '>=11.1.1' })
+];
+//# sourceMappingURL=upgrade-1.24.0-rc.0.js.map

package/dist/m365/spfx/commands/project/project-upgrade.js

@@ -2,7 +2,7 @@ import fs from 'fs';
 import os from 'os';
 import path from 'path';
 // Uncomment to support upgrading to preview releases
-// import { prerelease } from 'semver';
+import { prerelease } from 'semver';
 import { z } from 'zod';
 import { CommandError, globalOptionsZod } from '../../../../Command.js';
 import { fsUtil } from '../../../../utils/fsUtil.js';
@@ -87,7 +87,8 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             '1.22.1',
             '1.22.2',
             '1.23.0',
-            '1.23.2'
+            '1.23.2',
+            '1.24.0-rc.0'
         ];
     }
     async commandAction(logger, args) {
@@ -97,15 +98,15 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
         }
         this.toVersion = args.options.toVersion ? args.options.toVersion : this.supportedVersions[this.supportedVersions.length - 1];
         // Uncomment to support upgrading to preview releases
-        // if (!args.options.toVersion &&
-        //   !args.options.preview &&
-        //   prerelease(this.toVersion)) {
-        //   // no version and no preview specified while the current version to
-        //   // upgrade to is a prerelease so let's grab the first non-preview version
-        //   // since we're supporting only one preview version, it's sufficient for
-        //   // us to take second to last version
-        //   this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        // }
+        if (!args.options.toVersion &&
+            !args.options.preview &&
+            prerelease(this.toVersion)) {
+            // no version and no preview specified while the current version to
+            // upgrade to is a prerelease so let's grab the first non-preview version
+            // since we're supporting only one preview version, it's sufficient for
+            // us to take second to last version
+            this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        }
         this.packageManager = args.options.packageManager || 'npm';
         this.shell = args.options.shell || 'powershell';
         if (this.supportedVersions.indexOf(this.toVersion) < 0) {

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