@pnp/cli-microsoft365 7.2.0-beta.6775e3a → 7.2.0-beta.8577f52

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

@@ -0,0 +1,21 @@
+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 { FN002004_DEVDEP_gulp } from './rules/FN002004_DEVDEP_gulp.js';
+import { FN002007_DEVDEP_ajv } from './rules/FN002007_DEVDEP_ajv.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 { FN002019_DEVDEP_microsoft_rush_stack_compiler } from './rules/FN002019_DEVDEP_microsoft_rush_stack_compiler.js';
+export default [
+    new FN001008_DEP_react('17'),
+    new FN001009_DEP_react_dom('17'),
+    new FN001035_DEP_fluentui_react('^8.106.4'),
+    new FN002004_DEVDEP_gulp('4.0.2'),
+    new FN002007_DEVDEP_ajv('^6.12.5'),
+    new FN002013_DEVDEP_types_webpack_env('~1.15.2'),
+    new FN002015_DEVDEP_types_react('17'),
+    new FN002016_DEVDEP_types_react_dom('17'),
+    new FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.7'])
+];
+//# sourceMappingURL=doctor-1.18.2.js.map

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

@@ -68,7 +68,8 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
             '1.17.3',
             '1.17.4',
             '1.18.0',
-            '1.18.1-rc.0'
+            '1.18.1',
+            '1.18.2'
         ];
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);
@@ -205,6 +206,7 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
         return s.join('').trim();
     }
     getMdReport(findings) {
+        const projectName = this.getProject(this.projectRootPath).packageSolutionJson?.solution?.name;
         const findingsToReport = [];
         const reportData = this.getReportData(findings);
         findings.forEach(f => {
@@ -222,7 +224,7 @@ ${f.resolution}
             findingsToReport.push(`### ${f.id} ${f.title} | ${f.severity}`, os.EOL, os.EOL, f.description, os.EOL, os.EOL, resolution, os.EOL, `File: [${f.file}${(f.position ? `:${f.position.line}:${f.position.character}` : '')}](${f.file})`, os.EOL, os.EOL);
         });
         const s = [
-            `# Validate project ${path.basename(this.projectRootPath)}`, os.EOL,
+            `# Validate project ${projectName}`, os.EOL,
             os.EOL,
             `Date: ${(new Date().toLocaleDateString())}`, os.EOL,
             os.EOL,
@@ -250,8 +252,9 @@ ${f.resolution}
         return s.join('').trim();
     }
     getTourReport(findings) {
+        const projectName = this.getProject(this.projectRootPath).packageSolutionJson?.solution?.name;
         const tourFindings = {
-            title: `Validate project ${path.basename(this.projectRootPath)}`,
+            title: `Validate project ${projectName}`,
             steps: []
         };
         findings.forEach(f => {

package/dist/m365/spfx/commands/project/project-github-workflow-add.js

@@ -63,6 +63,19 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
             // eslint-disable-next-line camelcase
             workflow.on.workflow_dispatch = null;
         }
+        const version = this.getProjectVersion();
+        if (!version) {
+            throw `Unable to determine the version of the current SharePoint Framework project`;
+        }
+        const match = version.match(/^(\d+)\.(\d+)\.(\d+)$/);
+        const minorVersionString = match ? match[2] : null;
+        const minorVersion = minorVersionString ? Number(minorVersionString) : null;
+        if (minorVersion === null || isNaN(minorVersion)) {
+            throw `Unable to determine the minor version of the current SharePoint Framework project`;
+        }
+        if (minorVersion < 18) {
+            this.getNodeAction(workflow).with['node-version'] = '16.x';
+        }
         if (options.skipFeatureDeployment) {
             this.getDeployAction(workflow).with.SKIP_FEATURE_DEPLOYMENT = true;
         }
@@ -94,6 +107,10 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
         const steps = this.getWorkFlowSteps(workflow);
         return steps.find(step => step.uses && step.uses.indexOf('action-cli-deploy') >= 0);
     }
+    getNodeAction(workflow) {
+        const steps = this.getWorkFlowSteps(workflow);
+        return steps.find(step => step.uses && step.uses.indexOf('actions/setup-node@') >= 0);
+    }
     getWorkFlowSteps(workflow) {
         return workflow.jobs['build-and-deploy'].steps;
     }

package/dist/m365/spfx/commands/project/project-upgrade/{upgrade-1.18.1-rc.0.js → upgrade-1.18.1.js}

@@ -26,32 +26,32 @@ import { FN002023_DEVDEP_microsoft_eslint_config_spfx } from './rules/FN002023_D
 import { FN010001_YORC_version } from './rules/FN010001_YORC_version.js';
 import { FN014010_CODE_settings_filesexclude_jest } from './rules/FN014010_CODE_settings_filesexclude_jest.js';
 export default [
-    new FN001001_DEP_microsoft_sp_core_library('1.18.1-rc.0'),
-    new FN001002_DEP_microsoft_sp_lodash_subset('1.18.1-rc.0'),
-    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.18.1-rc.0'),
-    new FN001004_DEP_microsoft_sp_webpart_base('1.18.1-rc.0'),
-    new FN001011_DEP_microsoft_sp_dialog('1.18.1-rc.0'),
-    new FN001012_DEP_microsoft_sp_application_base('1.18.1-rc.0'),
-    new FN001014_DEP_microsoft_sp_listview_extensibility('1.18.1-rc.0'),
-    new FN001021_DEP_microsoft_sp_property_pane('1.18.1-rc.0'),
+    new FN001001_DEP_microsoft_sp_core_library('1.18.1'),
+    new FN001002_DEP_microsoft_sp_lodash_subset('1.18.1'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.18.1'),
+    new FN001004_DEP_microsoft_sp_webpart_base('1.18.1'),
+    new FN001011_DEP_microsoft_sp_dialog('1.18.1'),
+    new FN001012_DEP_microsoft_sp_application_base('1.18.1'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility('1.18.1'),
+    new FN001021_DEP_microsoft_sp_property_pane('1.18.1'),
     new FN001022_DEP_office_ui_fabric_react('', false),
-    new FN001023_DEP_microsoft_sp_component_base('1.18.1-rc.0'),
-    new FN001024_DEP_microsoft_sp_diagnostics('1.18.1-rc.0'),
-    new FN001025_DEP_microsoft_sp_dynamic_data('1.18.1-rc.0'),
-    new FN001026_DEP_microsoft_sp_extension_base('1.18.1-rc.0'),
-    new FN001027_DEP_microsoft_sp_http('1.18.1-rc.0'),
-    new FN001028_DEP_microsoft_sp_list_subscription('1.18.1-rc.0'),
-    new FN001029_DEP_microsoft_sp_loader('1.18.1-rc.0'),
-    new FN001030_DEP_microsoft_sp_module_interfaces('1.18.1-rc.0'),
-    new FN001031_DEP_microsoft_sp_odata_types('1.18.1-rc.0'),
-    new FN001032_DEP_microsoft_sp_page_context('1.18.1-rc.0'),
-    new FN001013_DEP_microsoft_decorators('1.18.1-rc.0'),
-    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.18.1-rc.0'),
-    new FN002001_DEVDEP_microsoft_sp_build_web('1.18.1-rc.0'),
-    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.18.1-rc.0'),
-    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.18.1-rc.0'),
-    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.18.1-rc.0'),
-    new FN010001_YORC_version('1.18.1-rc.0'),
+    new FN001023_DEP_microsoft_sp_component_base('1.18.1'),
+    new FN001024_DEP_microsoft_sp_diagnostics('1.18.1'),
+    new FN001025_DEP_microsoft_sp_dynamic_data('1.18.1'),
+    new FN001026_DEP_microsoft_sp_extension_base('1.18.1'),
+    new FN001027_DEP_microsoft_sp_http('1.18.1'),
+    new FN001028_DEP_microsoft_sp_list_subscription('1.18.1'),
+    new FN001029_DEP_microsoft_sp_loader('1.18.1'),
+    new FN001030_DEP_microsoft_sp_module_interfaces('1.18.1'),
+    new FN001031_DEP_microsoft_sp_odata_types('1.18.1'),
+    new FN001032_DEP_microsoft_sp_page_context('1.18.1'),
+    new FN001013_DEP_microsoft_decorators('1.18.1'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.18.1'),
+    new FN002001_DEVDEP_microsoft_sp_build_web('1.18.1'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.18.1'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.18.1'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.18.1'),
+    new FN010001_YORC_version('1.18.1'),
     new FN014010_CODE_settings_filesexclude_jest()
 ];
-//# sourceMappingURL=upgrade-1.18.1-rc.0.js.map
+//# sourceMappingURL=upgrade-1.18.1.js.map

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

@@ -0,0 +1,53 @@
+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 { 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 { FN002001_DEVDEP_microsoft_sp_build_web } from './rules/FN002001_DEVDEP_microsoft_sp_build_web.js';
+import { FN002002_DEVDEP_microsoft_sp_module_interfaces } from './rules/FN002002_DEVDEP_microsoft_sp_module_interfaces.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 { FN010001_YORC_version } from './rules/FN010001_YORC_version.js';
+export default [
+    new FN001001_DEP_microsoft_sp_core_library('1.18.2'),
+    new FN001002_DEP_microsoft_sp_lodash_subset('1.18.2'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.18.2'),
+    new FN001004_DEP_microsoft_sp_webpart_base('1.18.2'),
+    new FN001011_DEP_microsoft_sp_dialog('1.18.2'),
+    new FN001012_DEP_microsoft_sp_application_base('1.18.2'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility('1.18.2'),
+    new FN001021_DEP_microsoft_sp_property_pane('1.18.2'),
+    new FN001023_DEP_microsoft_sp_component_base('1.18.2'),
+    new FN001024_DEP_microsoft_sp_diagnostics('1.18.2'),
+    new FN001025_DEP_microsoft_sp_dynamic_data('1.18.2'),
+    new FN001026_DEP_microsoft_sp_extension_base('1.18.2'),
+    new FN001027_DEP_microsoft_sp_http('1.18.2'),
+    new FN001028_DEP_microsoft_sp_list_subscription('1.18.2'),
+    new FN001029_DEP_microsoft_sp_loader('1.18.2'),
+    new FN001030_DEP_microsoft_sp_module_interfaces('1.18.2'),
+    new FN001031_DEP_microsoft_sp_odata_types('1.18.2'),
+    new FN001032_DEP_microsoft_sp_page_context('1.18.2'),
+    new FN001013_DEP_microsoft_decorators('1.18.2'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.18.2'),
+    new FN002001_DEVDEP_microsoft_sp_build_web('1.18.2'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.18.2'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.18.2'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.18.2'),
+    new FN010001_YORC_version('1.18.2')
+];
+//# sourceMappingURL=upgrade-1.18.2.js.map

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

@@ -7,8 +7,6 @@ var _SpfxProjectUpgradeCommand_instances, _a, _SpfxProjectUpgradeCommand_initTel
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-// uncomment to support upgrading to preview releases
-import { prerelease } from 'semver';
 import { CommandError } from '../../../../Command.js';
 import { fsUtil } from '../../../../utils/fsUtil.js';
 import { packageManager } from '../../../../utils/packageManager.js';
@@ -72,7 +70,8 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             '1.17.3',
             '1.17.4',
             '1.18.0',
-            '1.18.1-rc.0'
+            '1.18.1',
+            '1.18.2'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
@@ -85,15 +84,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 || 'bash';
         if (this.supportedVersions.indexOf(this.toVersion) < 0) {
@@ -299,6 +298,7 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
         return s.join('').trim();
     }
     getMdReport(findings) {
+        const projectName = this.getProject(this.projectRootPath).packageSolutionJson?.solution?.name;
         const findingsToReport = [];
         const reportData = this.getReportData(findings);
         findings.forEach(f => {
@@ -325,7 +325,7 @@ ${f.resolution}
             findingsToReport.push(`### ${f.id} ${f.title} | ${f.severity}`, os.EOL, os.EOL, f.description, os.EOL, os.EOL, resolution, os.EOL, `File: [${f.file}${(f.position ? `:${f.position.line}:${f.position.character}` : '')}](${f.file})`, os.EOL, os.EOL);
         });
         const s = [
-            `# Upgrade project ${path.basename(this.projectRootPath)} to v${this.toVersion}`, os.EOL,
+            `# Upgrade project ${projectName} to v${this.toVersion}`, os.EOL,
             os.EOL,
             `Date: ${(new Date().toLocaleDateString())}`, os.EOL,
             os.EOL,
@@ -361,8 +361,9 @@ ${f.resolution}
         return s.join('').trim();
     }
     getTourReport(findings, project) {
+        const projectName = this.getProject(this.projectRootPath).packageSolutionJson?.solution?.name;
         const tourFindings = {
-            title: `Upgrade project ${path.basename(this.projectRootPath)} to v${this.toVersion}`,
+            title: `Upgrade project ${projectName} to v${this.toVersion}`,
             steps: []
         };
         findings.forEach(f => {
@@ -480,9 +481,9 @@ _a = SpfxProjectUpgradeCommand, _SpfxProjectUpgradeCommand_instances = new WeakS
             preview: args.options.preview
         });
         // uncomment to support upgrading to preview releases
-        if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
-            this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        }
+        // if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
+        //   this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        // }
     });
 }, _SpfxProjectUpgradeCommand_initOptions = function _SpfxProjectUpgradeCommand_initOptions() {
     this.options.unshift({

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

@@ -539,7 +539,7 @@ class SpfxDoctorCommand extends BaseProjectCommand {
                     fix: 'npm i -g yo@4'
                 }
             },
-            '1.18.1-rc.0': {
+            '1.18.1': {
                 gulpCli: {
                     range: '^1 || ^2',
                     fix: 'npm i -g gulp-cli@2'
@@ -553,6 +553,21 @@ class SpfxDoctorCommand extends BaseProjectCommand {
                     range: '^4',
                     fix: 'npm i -g yo@4'
                 }
+            },
+            '1.18.2': {
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
+                },
+                node: {
+                    range: '>=16.13.0 <17.0.0 || >=18.17.1 <19.0.0',
+                    fix: 'Install Node.js >=16.13.0 <17.0.0 || >=18.17.1 <19.0.0'
+                },
+                sp: SharePointVersion.SPO,
+                yo: {
+                    range: '^4 || ^5',
+                    fix: 'npm i -g yo@5'
+                }
             }
         };
         __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initTelemetry).call(this);

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

@@ -4,14 +4,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoFileRetentionLabelEnsureCommand_instances, _SpoFileRetentionLabelEnsureCommand_initTelemetry, _SpoFileRetentionLabelEnsureCommand_initOptions, _SpoFileRetentionLabelEnsureCommand_initValidators, _SpoFileRetentionLabelEnsureCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import * as url from 'url';
 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';
-import spoListItemRetentionLabelEnsureCommand from '../listitem/listitem-retentionlabel-ensure.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { urlUtil } from '../../../../utils/urlUtil.js';
+import { spo } from '../../../../utils/spo.js';
 class SpoFileRetentionLabelEnsureCommand extends SpoCommand {
     get name() {
         return commands.FILE_RETENTIONLABEL_ENSURE;
@@ -30,22 +30,13 @@ class SpoFileRetentionLabelEnsureCommand extends SpoCommand {
     async commandAction(logger, args) {
         try {
             const fileProperties = await this.getFileProperties(logger, args);
+            const parsedUrl = url.parse(args.options.webUrl);
+            const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
+            const listAbsoluteUrl = urlUtil.urlCombine(tenantUrl, fileProperties.listServerRelativeUrl);
             if (args.options.assetId) {
-                await this.applyAssetId(args.options.webUrl, fileProperties.ListItemAllFields.ParentList.Id, fileProperties.ListItemAllFields.Id, args.options.assetId);
-            }
-            const options = {
-                webUrl: args.options.webUrl,
-                listId: fileProperties.ListItemAllFields.ParentList.Id,
-                listItemId: fileProperties.ListItemAllFields.Id,
-                name: args.options.name,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const spoListItemRetentionLabelEnsureCommandOutput = await Cli.executeCommandWithOutput(spoListItemRetentionLabelEnsureCommand, { options: { ...options, _: [] } });
-            if (this.verbose) {
-                await logger.logToStderr(spoListItemRetentionLabelEnsureCommandOutput.stderr);
+                await this.applyAssetId(args.options.webUrl, fileProperties.listServerRelativeUrl, fileProperties.listItemId, args.options.assetId);
             }
+            await spo.applyRetentionLabelToListItems(args.options.webUrl, args.options.name, listAbsoluteUrl, [parseInt(fileProperties.listItemId)], logger, args.options.verbose);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
@@ -64,19 +55,19 @@ class SpoFileRetentionLabelEnsureCommand extends SpoCommand {
             requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
         }
         const requestOptions = {
-            url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList&$select=ServerRelativeUrl,ListItemAllFields/ParentList/Id,ListItemAllFields/Id`,
+            url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList/RootFolder&$select=ServerRelativeUrl,ListItemAllFields/ParentList/RootFolder/ServerRelativeUrl,ListItemAllFields/Id`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
-        return request.get(requestOptions);
+        const response = await request.get(requestOptions);
+        return { listItemId: response.ListItemAllFields.Id, listServerRelativeUrl: response.ListItemAllFields.ParentList.RootFolder.ServerRelativeUrl };
     }
-    async applyAssetId(webUrl, listId, listItemId, assetId) {
-        const requestUrl = `${webUrl}/_api/web/lists(guid'${formatting.encodeQueryParameter(listId)}')`;
+    async applyAssetId(webUrl, listServerRelativeUrl, listItemId, assetId) {
         const requestBody = { "formValues": [{ "FieldName": "ComplianceAssetId", "FieldValue": assetId }] };
         const requestOptions = {
-            url: `${requestUrl}/items(${listItemId})/ValidateUpdateListItem()`,
+            url: `${webUrl}/_api/web/GetList(@listUrl)/items(${listItemId})/ValidateUpdateListItem()?@listUrl='${formatting.encodeQueryParameter(listServerRelativeUrl)}'`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },

package/dist/m365/spo/commands/file/file-retentionlabel-remove.js

@@ -4,14 +4,15 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoFileRetentionLabelRemoveCommand_instances, _SpoFileRetentionLabelRemoveCommand_initTelemetry, _SpoFileRetentionLabelRemoveCommand_initOptions, _SpoFileRetentionLabelRemoveCommand_initValidators, _SpoFileRetentionLabelRemoveCommand_initOptionSets;
+import * as url from 'url';
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import spoListItemRetentionLabelRemoveCommand from '../listitem/listitem-retentionlabel-remove.js';
 class SpoFileRetentionLabelRemoveCommand extends SpoCommand {
     get name() {
         return commands.FILE_RETENTIONLABEL_REMOVE;
@@ -39,36 +40,21 @@ class SpoFileRetentionLabelRemoveCommand extends SpoCommand {
         }
     }
     async removeFileRetentionLabel(logger, args) {
-        if (this.verbose) {
-            await logger.logToStderr(`Removing retention label from file ${args.options.fileId || args.options.fileUrl} in site at ${args.options.webUrl}...`);
-        }
         try {
-            const fileProperties = await this.getFileProperties(args);
-            const options = {
-                webUrl: args.options.webUrl,
-                listId: fileProperties.listId,
-                listItemId: fileProperties.id,
-                force: true,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const spoListItemRetentionLabelRemoveCommandOutput = await Cli.executeCommandWithOutput(spoListItemRetentionLabelRemoveCommand, { options: { ...options, _: [] } });
-            if (this.verbose) {
-                await logger.logToStderr(spoListItemRetentionLabelRemoveCommandOutput.stderr);
-            }
+            const fileProperties = await this.getFileProperties(logger, args);
+            const parsedUrl = url.parse(args.options.webUrl);
+            const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
+            const listAbsoluteUrl = urlUtil.urlCombine(tenantUrl, fileProperties.listServerRelativeUrl);
+            await spo.removeRetentionLabelFromListItems(args.options.webUrl, listAbsoluteUrl, [parseInt(fileProperties.listItemId)], logger, args.options.verbose);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getFileProperties(args) {
-        const requestOptions = {
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
+    async getFileProperties(logger, args) {
+        if (this.verbose) {
+            logger.logToStderr(`Retrieving list and item information for file '${args.options.fileId || args.options.fileUrl}' in site at ${args.options.webUrl}...`);
+        }
         let requestUrl = `${args.options.webUrl}/_api/web/`;
         if (args.options.fileId) {
             requestUrl += `GetFileById('${args.options.fileId}')`;
@@ -77,9 +63,15 @@ class SpoFileRetentionLabelRemoveCommand extends SpoCommand {
             const serverRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
             requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
         }
-        requestOptions.url = `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList&$select=ListItemAllFields/ParentList/Id,ListItemAllFields/Id`;
+        const requestOptions = {
+            url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList/RootFolder&$select=ServerRelativeUrl,ListItemAllFields/ParentList/RootFolder/ServerRelativeUrl,ListItemAllFields/Id`,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
         const response = await request.get(requestOptions);
-        return { id: response.ListItemAllFields.Id, listId: response.ListItemAllFields.ParentList.Id };
+        return { listItemId: response.ListItemAllFields.Id, listServerRelativeUrl: response.ListItemAllFields.ParentList.RootFolder.ServerRelativeUrl };
     }
 }
 _SpoFileRetentionLabelRemoveCommand_instances = new WeakSet(), _SpoFileRetentionLabelRemoveCommand_initTelemetry = function _SpoFileRetentionLabelRemoveCommand_initTelemetry() {

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

@@ -4,15 +4,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoFolderRetentionLabelEnsureCommand_instances, _SpoFolderRetentionLabelEnsureCommand_initTelemetry, _SpoFolderRetentionLabelEnsureCommand_initOptions, _SpoFolderRetentionLabelEnsureCommand_initValidators, _SpoFolderRetentionLabelEnsureCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import * as url from 'url';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import spoListRetentionLabelEnsureCommand from '../list/list-retentionlabel-ensure.js';
-import spoListItemRetentionLabelEnsureCommand from '../listitem/listitem-retentionlabel-ensure.js';
 class SpoFolderRetentionLabelEnsureCommand extends SpoCommand {
     get name() {
         return commands.FOLDER_RETENTIONLABEL_ENSURE;
@@ -32,33 +31,14 @@ class SpoFolderRetentionLabelEnsureCommand extends SpoCommand {
         try {
             const folderProperties = await this.getFolderProperties(logger, args);
             if (folderProperties.ListItemAllFields) {
-                const options = {
-                    webUrl: args.options.webUrl,
-                    listId: folderProperties.ListItemAllFields.ParentList.Id,
-                    listItemId: folderProperties.ListItemAllFields.Id,
-                    name: args.options.name,
-                    output: 'json',
-                    debug: this.debug,
-                    verbose: this.verbose
-                };
-                const spoListItemRetentionLabelEnsureCommandOutput = await Cli.executeCommandWithOutput(spoListItemRetentionLabelEnsureCommand, { options: { ...options, _: [] } });
-                if (this.verbose) {
-                    await logger.logToStderr(spoListItemRetentionLabelEnsureCommandOutput.stderr);
-                }
+                const parsedUrl = url.parse(args.options.webUrl);
+                const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
+                const listAbsoluteUrl = urlUtil.urlCombine(tenantUrl, folderProperties.ListItemAllFields.ParentList.RootFolder.ServerRelativeUrl);
+                await spo.applyRetentionLabelToListItems(args.options.webUrl, args.options.name, listAbsoluteUrl, [parseInt(folderProperties.ListItemAllFields.Id)], logger, args.options.verbose);
             }
             else {
-                const options = {
-                    webUrl: args.options.webUrl,
-                    listUrl: folderProperties.ServerRelativeUrl,
-                    name: args.options.name,
-                    output: 'json',
-                    debug: this.debug,
-                    verbose: this.verbose
-                };
-                const spoListRetentionLabelEnsureCommandOutput = await Cli.executeCommandWithOutput(spoListRetentionLabelEnsureCommand, { options: { ...options, _: [] } });
-                if (this.verbose) {
-                    await logger.logToStderr(spoListRetentionLabelEnsureCommandOutput.stderr);
-                }
+                const listAbsoluteUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, folderProperties.ServerRelativeUrl);
+                await spo.applyDefaultRetentionLabelToList(args.options.webUrl, args.options.name, listAbsoluteUrl, false, logger, args.options.verbose);
             }
         }
         catch (err) {
@@ -78,7 +58,7 @@ class SpoFolderRetentionLabelEnsureCommand extends SpoCommand {
             requestUrl += `GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
         }
         const requestOptions = {
-            url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList&$select=ServerRelativeUrl,ListItemAllFields/ParentList/Id,ListItemAllFields/Id`,
+            url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList/RootFolder&$select=ServerRelativeUrl,ListItemAllFields/ParentList/RootFolder/ServerRelativeUrl,ListItemAllFields/Id`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },

package/dist/m365/spo/commands/folder/folder-retentionlabel-remove.js

@@ -4,15 +4,15 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoFolderRetentionLabelRemoveCommand_instances, _SpoFolderRetentionLabelRemoveCommand_initTelemetry, _SpoFolderRetentionLabelRemoveCommand_initOptions, _SpoFolderRetentionLabelRemoveCommand_initValidators, _SpoFolderRetentionLabelRemoveCommand_initOptionSets;
+import * as url from 'url';
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import spoListRetentionLabelRemoveCommand from '../list/list-retentionlabel-remove.js';
-import spoListItemRetentionLabelRemoveCommand from '../listitem/listitem-retentionlabel-remove.js';
 class SpoFolderRetentionLabelRemoveCommand extends SpoCommand {
     get name() {
         return commands.FOLDER_RETENTIONLABEL_REMOVE;
@@ -43,33 +43,14 @@ class SpoFolderRetentionLabelRemoveCommand extends SpoCommand {
         try {
             const folderProperties = await this.getFolderProperties(logger, args);
             if (folderProperties.ListItemAllFields) {
-                const options = {
-                    webUrl: args.options.webUrl,
-                    listId: folderProperties.ListItemAllFields.ParentList.Id,
-                    listItemId: folderProperties.ListItemAllFields.Id,
-                    force: true,
-                    output: 'json',
-                    debug: this.debug,
-                    verbose: this.verbose
-                };
-                const spoListItemRetentionLabelRemoveCommandOutput = await Cli.executeCommandWithOutput(spoListItemRetentionLabelRemoveCommand, { options: { ...options, _: [] } });
-                if (this.verbose) {
-                    await logger.logToStderr(spoListItemRetentionLabelRemoveCommandOutput.stderr);
-                }
+                const parsedUrl = url.parse(args.options.webUrl);
+                const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
+                const listAbsoluteUrl = urlUtil.urlCombine(tenantUrl, folderProperties.ListItemAllFields.ParentList.RootFolder.ServerRelativeUrl);
+                await spo.removeRetentionLabelFromListItems(args.options.webUrl, listAbsoluteUrl, [parseInt(folderProperties.ListItemAllFields.Id)], logger, args.options.verbose);
             }
             else {
-                const options = {
-                    webUrl: args.options.webUrl,
-                    listUrl: folderProperties.ServerRelativeUrl,
-                    force: true,
-                    output: 'json',
-                    debug: this.debug,
-                    verbose: this.verbose
-                };
-                const spoListRetentionLabelEnsureCommandOutput = await Cli.executeCommandWithOutput(spoListRetentionLabelRemoveCommand, { options: { ...options, _: [] } });
-                if (this.verbose) {
-                    await logger.logToStderr(spoListRetentionLabelEnsureCommandOutput.stderr);
-                }
+                const listAbsoluteUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, folderProperties.ServerRelativeUrl);
+                await spo.removeDefaultRetentionLabelFromList(args.options.webUrl, listAbsoluteUrl, logger, args.options.verbose);
             }
         }
         catch (err) {
@@ -89,7 +70,7 @@ class SpoFolderRetentionLabelRemoveCommand extends SpoCommand {
             requestUrl += `GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
         }
         const requestOptions = {
-            url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList&$select=ServerRelativeUrl,ListItemAllFields/ParentList/Id,ListItemAllFields/Id`,
+            url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList/RootFolder&$select=ServerRelativeUrl,ListItemAllFields/ParentList/RootFolder/ServerRelativeUrl,ListItemAllFields/Id`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },