@pnp/cli-microsoft365 10.1.0-beta.6c6be23 → 10.1.0-beta.deac605

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

@@ -4,7 +4,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoListItemRetentionLabelEnsureCommand_instances, _SpoListItemRetentionLabelEnsureCommand_initTelemetry, _SpoListItemRetentionLabelEnsureCommand_initOptions, _SpoListItemRetentionLabelEnsureCommand_initValidators, _SpoListItemRetentionLabelEnsureCommand_initOptionSets;
-import * as url from 'url';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
@@ -60,7 +59,7 @@ class SpoListItemRetentionLabelEnsureCommand extends SpoCommand {
         return label.TagName;
     }
     async getListAbsoluteUrl(options, logger) {
-        const parsedUrl = url.parse(options.webUrl);
+        const parsedUrl = new URL(options.webUrl);
         const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
         if (options.listUrl) {
             const serverRelativePath = urlUtil.getServerRelativePath(options.webUrl, options.listUrl);

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

@@ -4,7 +4,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoListItemRetentionLabelRemoveCommand_instances, _SpoListItemRetentionLabelRemoveCommand_initTelemetry, _SpoListItemRetentionLabelRemoveCommand_initOptions, _SpoListItemRetentionLabelRemoveCommand_initValidators, _SpoListItemRetentionLabelRemoveCommand_initOptionSets;
-import * as url from 'url';
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -49,7 +48,7 @@ class SpoListItemRetentionLabelRemoveCommand extends SpoCommand {
         }
     }
     async getListAbsoluteUrl(options, logger) {
-        const parsedUrl = url.parse(options.webUrl);
+        const parsedUrl = new URL(options.webUrl);
         const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
         if (options.listUrl) {
             const serverRelativePath = urlUtil.getServerRelativePath(options.webUrl, options.listUrl);

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

@@ -34,7 +34,7 @@ class SpoPageAddCommand extends SpoCommand {
         let bannerImageUrl = '';
         let canvasContent1 = '';
         let layoutWebpartsContent = '';
-        const pageTitle = args.options.title ? args.options.title : (args.options.name.indexOf('.aspx') > -1 ? args.options.name.substr(0, args.options.name.indexOf('.aspx')) : args.options.name);
+        const pageTitle = args.options.title ? args.options.title : (args.options.name.indexOf('.aspx') > -1 ? args.options.name.substring(0, args.options.name.indexOf('.aspx')) : args.options.name);
         let pageId = null;
         const pageDescription = args.options.description || "";
         if (!pageName.endsWith('.aspx')) {

package/dist/m365/spo/commands/site/site-admin-add.js

@@ -47,22 +47,14 @@ class SpoSiteAdminAddCommand extends SpoCommand {
             await logger.logToStderr('Adding site administrator as an administrator...');
         }
         const adminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-        const siteId = await this.getSiteIdBasedOnUrl(args.options.siteUrl, logger);
-        const siteAdmins = (await this.getSiteAdmins(adminUrl, siteId)).map(u => u.loginName);
+        const tenantSiteProperties = await spo.getSiteAdminPropertiesByUrl(args.options.siteUrl, false, logger, this.verbose);
+        const siteAdmins = (await this.getSiteAdmins(adminUrl, tenantSiteProperties.SiteId)).map(u => u.loginName);
         siteAdmins.push(loginNameToAdd);
-        await this.setSiteAdminsAsAdmin(adminUrl, siteId, siteAdmins);
+        await this.setSiteAdminsAsAdmin(adminUrl, tenantSiteProperties.SiteId, siteAdmins);
         if (args.options.primary) {
-            await this.setPrimaryAdminAsAdmin(adminUrl, siteId, loginNameToAdd);
+            await this.setPrimaryAdminAsAdmin(adminUrl, tenantSiteProperties.SiteId, loginNameToAdd);
         }
     }
-    async getSiteIdBasedOnUrl(siteUrl, logger) {
-        const siteGraphId = await spo.getSiteId(siteUrl, logger, this.verbose);
-        const match = siteGraphId.match(/,([a-f0-9\-]{36}),/i);
-        if (!match) {
-            throw `Site with URL ${siteUrl} not found`;
-        }
-        return match[1];
-    }
     async getSiteAdmins(adminUrl, siteId) {
         const requestOptions = {
             url: `${adminUrl}/_api/SPO.Tenant/GetSiteAdministrators?siteId='${siteId}'`,

package/dist/m365/spo/commands/site/site-admin-list.js

@@ -45,16 +45,16 @@ class SpoSiteAdminListCommand extends SpoCommand {
             await logger.logToStderr('Retrieving site administrators as an administrator...');
         }
         const adminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-        const siteId = await this.getSiteId(args.options.siteUrl, logger);
+        const tenantSiteProperties = await spo.getSiteAdminPropertiesByUrl(args.options.siteUrl, false, logger, this.verbose);
         const requestOptions = {
-            url: `${adminUrl}/_api/SPO.Tenant/GetSiteAdministrators?siteId='${siteId}'`,
+            url: `${adminUrl}/_api/SPO.Tenant/GetSiteAdministrators?siteId='${tenantSiteProperties.SiteId}'`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
         const response = await request.post(requestOptions);
-        const primaryAdminLoginName = await spo.getPrimaryAdminLoginNameAsAdmin(adminUrl, siteId, logger, this.verbose);
+        const primaryAdminLoginName = await spo.getPrimaryAdminLoginNameAsAdmin(adminUrl, tenantSiteProperties.SiteId, logger, this.verbose);
         const mappedResult = response.value.map((u) => ({
             Email: u.email,
             LoginName: u.loginName,
@@ -63,14 +63,6 @@ class SpoSiteAdminListCommand extends SpoCommand {
         }));
         await logger.log(mappedResult);
     }
-    async getSiteId(siteUrl, logger) {
-        const siteGraphId = await spo.getSiteId(siteUrl, logger, this.verbose);
-        const match = siteGraphId.match(/,([a-f0-9\-]{36}),/i);
-        if (!match) {
-            throw `Site with URL ${siteUrl} not found`;
-        }
-        return match[1];
-    }
     async callAction(logger, args) {
         if (this.verbose) {
             await logger.logToStderr('Retrieving site administrators...');

package/dist/m365/spo/commands/site/site-admin-remove.js

@@ -54,22 +54,14 @@ class SpoSiteAdminRemoveCommand extends SpoCommand {
             await logger.logToStderr('Removing site administrator as an administrator...');
         }
         const adminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-        const siteId = await this.getSiteId(args.options.siteUrl, logger);
-        const primaryAdminLoginName = await spo.getPrimaryAdminLoginNameAsAdmin(adminUrl, siteId, logger, this.verbose);
+        const tenantSiteProperties = await spo.getSiteAdminPropertiesByUrl(args.options.siteUrl, false, logger, this.verbose);
+        const primaryAdminLoginName = await spo.getPrimaryAdminLoginNameAsAdmin(adminUrl, tenantSiteProperties.SiteId, logger, this.verbose);
         if (loginNameToRemove === primaryAdminLoginName) {
             throw 'You cannot remove the primary site collection administrator.';
         }
-        const existingAdmins = await this.getSiteAdmins(adminUrl, siteId);
+        const existingAdmins = await this.getSiteAdmins(adminUrl, tenantSiteProperties.SiteId);
         const adminsToSet = existingAdmins.filter(u => u.loginName.toLowerCase() !== loginNameToRemove.toLowerCase());
-        await this.setSiteAdminsAsAdmin(adminUrl, siteId, adminsToSet);
-    }
-    async getSiteId(siteUrl, logger) {
-        const siteGraphId = await spo.getSiteId(siteUrl, logger, this.verbose);
-        const match = siteGraphId.match(/,([a-f0-9\-]{36}),/i);
-        if (!match) {
-            throw `Site with URL ${siteUrl} not found`;
-        }
-        return match[1];
+        await this.setSiteAdminsAsAdmin(adminUrl, tenantSiteProperties.SiteId, adminsToSet);
     }
     async getSiteAdmins(adminUrl, siteId) {
         const requestOptions = {

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

@@ -373,7 +373,7 @@ class SpoSiteSetCommand extends SpoCommand {
                 headers: {
                     'X-RequestDigest': this.context.FormDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions>${payload.join('')}<ObjectPath Id="14" ObjectPathId="13" /><ObjectIdentityQuery Id="15" ObjectPathId="5" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="53d8499e-d0d2-5000-cb83-9ade5be42ca4|${this.tenantId.substr(pos, this.tenantId.indexOf('&') - pos)}&#xA;SiteProperties&#xA;${formatting.encodeQueryParameter(args.options.url)}" /><Method Id="13" ParentId="5" Name="Update" /></ObjectPaths></Request>`
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions>${payload.join('')}<ObjectPath Id="14" ObjectPathId="13" /><ObjectIdentityQuery Id="15" ObjectPathId="5" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="53d8499e-d0d2-5000-cb83-9ade5be42ca4|${this.tenantId.substring(pos, this.tenantId.indexOf('&'))}&#xA;SiteProperties&#xA;${formatting.encodeQueryParameter(args.options.url)}" /><Method Id="13" ParentId="5" Name="Update" /></ObjectPaths></Request>`
             };
             response = await request.post(requestOptions);
         }

package/dist/m365/spp/commands/model/model-remove.js

@@ -0,0 +1,105 @@
+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 _SppModelRemoveCommand_instances, _SppModelRemoveCommand_initTelemetry, _SppModelRemoveCommand_initOptions, _SppModelRemoveCommand_initValidators, _SppModelRemoveCommand_initOptionSets, _SppModelRemoveCommand_initTypes;
+import { cli } from '../../../../cli/cli.js';
+import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { spp } from '../../../../utils/spp.js';
+import { urlUtil } from '../../../../utils/urlUtil.js';
+import { validation } from '../../../../utils/validation.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+class SppModelRemoveCommand extends SpoCommand {
+    get name() {
+        return commands.MODEL_REMOVE;
+    }
+    get description() {
+        return 'Deletes a document understanding model';
+    }
+    constructor() {
+        super();
+        _SppModelRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SppModelRemoveCommand_instances, "m", _SppModelRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SppModelRemoveCommand_instances, "m", _SppModelRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SppModelRemoveCommand_instances, "m", _SppModelRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SppModelRemoveCommand_instances, "m", _SppModelRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SppModelRemoveCommand_instances, "m", _SppModelRemoveCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            if (!args.options.force) {
+                const confirmationResult = await cli.promptForConfirmation({ message: `Are you sure you want to remove model '${args.options.title ?? args.options.id}'?` });
+                if (!confirmationResult) {
+                    return;
+                }
+            }
+            if (this.verbose) {
+                await logger.log(`Removing model from ${args.options.siteUrl}...`);
+            }
+            const siteUrl = urlUtil.removeTrailingSlashes(args.options.siteUrl);
+            await spp.assertSiteIsContentCenter(siteUrl);
+            let requestUrl = `${siteUrl}/_api/machinelearning/models/`;
+            if (args.options.title) {
+                let requestTitle = args.options.title.toLowerCase();
+                if (!requestTitle.endsWith('.classifier')) {
+                    requestTitle += '.classifier';
+                }
+                requestUrl += `getbytitle('${formatting.encodeQueryParameter(requestTitle)}')`;
+            }
+            else {
+                requestUrl += `getbyuniqueid('${args.options.id}')`;
+            }
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    accept: 'application/json;odata=nometadata',
+                    'if-match': '*'
+                },
+                responseType: 'json'
+            };
+            const result = await request.delete(requestOptions);
+            if (result?.['odata.null'] === true) {
+                throw "Model not found.";
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+_SppModelRemoveCommand_instances = new WeakSet(), _SppModelRemoveCommand_initTelemetry = function _SppModelRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
+            force: !!args.options.force
+        });
+    });
+}, _SppModelRemoveCommand_initOptions = function _SppModelRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '-f, --force'
+    });
+}, _SppModelRemoveCommand_initValidators = function _SppModelRemoveCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID for option 'id'.`;
+        }
+        return validation.isValidSharePointUrl(args.options.siteUrl);
+    });
+}, _SppModelRemoveCommand_initOptionSets = function _SppModelRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'title'] });
+}, _SppModelRemoveCommand_initTypes = function _SppModelRemoveCommand_initTypes() {
+    this.types.string.push('siteUrl', 'id', 'title');
+    this.types.boolean.push('force');
+};
+export default new SppModelRemoveCommand();
+//# sourceMappingURL=model-remove.js.map

package/dist/m365/spp/commands.js

@@ -1,6 +1,7 @@
 const prefix = 'spp';
 export default {
     CONTENTCENTER_LIST: `${prefix} contentcenter list`,
-    MODEL_LIST: `${prefix} model list`
+    MODEL_LIST: `${prefix} model list`,
+    MODEL_REMOVE: `${prefix} model remove`
 };
 //# sourceMappingURL=commands.js.map

package/dist/m365/teams/commands/user/user-app-list.js

@@ -33,7 +33,7 @@ class TeamsUserAppListCommand extends GraphCommand {
             const items = await odata.getAllItems(endpoint);
             items.forEach(i => {
                 const userAppId = Buffer.from(i.id, 'base64').toString('ascii');
-                const appId = userAppId.substr(userAppId.indexOf("##") + 2, userAppId.length - userId.length - 2);
+                const appId = userAppId.substring(userAppId.indexOf("##") + 2, userAppId.length);
                 i.appId = appId;
             });
             if (!cli.shouldTrimOutput(args.options.output)) {

package/dist/m365/tenant/commands/report/report-office365activationcounts.js

@@ -27,12 +27,11 @@ class TenantReportOffice365ActivationCountsCommand extends GraphCommand {
         try {
             const res = await request.get(requestOptions);
             let content = '';
-            const cleanResponse = this.removeEmptyLines(res);
             if (output && output.toLowerCase() === 'json') {
-                content = formatting.parseCsvToJson(cleanResponse);
+                content = formatting.parseCsvToJson(res);
             }
             else {
-                content = cleanResponse;
+                content = res;
             }
             await logger.log(content);
         }
@@ -40,11 +39,6 @@ class TenantReportOffice365ActivationCountsCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    removeEmptyLines(input) {
-        const rows = input.split('\n');
-        const cleanRows = rows.filter(Boolean);
-        return cleanRows.join('\n');
-    }
 }
 export default new TenantReportOffice365ActivationCountsCommand();
 //# sourceMappingURL=report-office365activationcounts.js.map

package/dist/m365/tenant/commands/report/report-office365activationsusercounts.js

@@ -27,12 +27,11 @@ class TenantReportOffice365ActivationsUserCountsCommand extends GraphCommand {
         try {
             const res = await request.get(requestOptions);
             let content = '';
-            const cleanResponse = this.removeEmptyLines(res);
             if (output && output.toLowerCase() === 'json') {
-                content = formatting.parseCsvToJson(cleanResponse);
+                content = formatting.parseCsvToJson(res);
             }
             else {
-                content = cleanResponse;
+                content = res;
             }
             await logger.log(content);
         }
@@ -40,11 +39,6 @@ class TenantReportOffice365ActivationsUserCountsCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    removeEmptyLines(input) {
-        const rows = input.split('\n');
-        const cleanRows = rows.filter(Boolean);
-        return cleanRows.join('\n');
-    }
 }
 export default new TenantReportOffice365ActivationsUserCountsCommand();
 //# sourceMappingURL=report-office365activationsusercounts.js.map

package/dist/m365/tenant/commands/report/report-office365activationsuserdetail.js

@@ -27,12 +27,11 @@ class TenantReportOffice365ActivationsUserDetailCommand extends GraphCommand {
         try {
             const res = await request.get(requestOptions);
             let content = '';
-            const cleanResponse = this.removeEmptyLines(res);
             if (output && output.toLowerCase() === 'json') {
-                content = formatting.parseCsvToJson(cleanResponse);
+                content = formatting.parseCsvToJson(res);
             }
             else {
-                content = cleanResponse;
+                content = res;
             }
             await logger.log(content);
         }
@@ -40,11 +39,6 @@ class TenantReportOffice365ActivationsUserDetailCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    removeEmptyLines(input) {
-        const rows = input.split('\n');
-        const cleanRows = rows.filter(Boolean);
-        return cleanRows.join('\n');
-    }
 }
 export default new TenantReportOffice365ActivationsUserDetailCommand();
 //# sourceMappingURL=report-office365activationsuserdetail.js.map

package/dist/m365/todo/commands/list/list-remove.js

@@ -6,6 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TodoListRemoveCommand_instances, _TodoListRemoveCommand_initTelemetry, _TodoListRemoveCommand_initOptions, _TodoListRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import DelegatedGraphCommand from '../../../base/DelegatedGraphCommand.js';
 import commands from '../../commands.js';
 class TodoListRemoveCommand extends DelegatedGraphCommand {
@@ -38,7 +39,7 @@ class TodoListRemoveCommand extends DelegatedGraphCommand {
             return args.options.id;
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${escape(args.options.name)}'`,
+            url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${formatting.encodeQueryParameter(args.options.name)}'`,
             headers: {
                 accept: "application/json;odata.metadata=none"
             },

package/dist/m365/todo/commands/list/list-set.js

@@ -5,6 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TodoListSetCommand_instances, _TodoListSetCommand_initTelemetry, _TodoListSetCommand_initOptions, _TodoListSetCommand_initOptionSets;
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import DelegatedGraphCommand from '../../../base/DelegatedGraphCommand.js';
 import commands from '../../commands.js';
 class TodoListSetCommand extends DelegatedGraphCommand {
@@ -52,7 +53,7 @@ class TodoListSetCommand extends DelegatedGraphCommand {
             return args.options.id;
         }
         const requestOptions = {
-            url: `${endpoint}/me/todo/lists?$filter=displayName eq '${escape(args.options.name)}'`,
+            url: `${endpoint}/me/todo/lists?$filter=displayName eq '${formatting.encodeQueryParameter(args.options.name)}'`,
             headers: {
                 accept: "application/json;odata.metadata=none"
             },

package/dist/m365/todo/commands/task/task-add.js

@@ -5,6 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TodoTaskAddCommand_instances, _a, _TodoTaskAddCommand_initTelemetry, _TodoTaskAddCommand_initOptions, _TodoTaskAddCommand_initValidators, _TodoTaskAddCommand_initOptionSets;
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import DelegatedGraphCommand from '../../../base/DelegatedGraphCommand.js';
 import commands from '../../commands.js';
@@ -71,7 +72,7 @@ class TodoTaskAddCommand extends DelegatedGraphCommand {
             return args.options.listId;
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${escape(args.options.listName)}'`,
+            url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${formatting.encodeQueryParameter(args.options.listName)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },

package/dist/m365/todo/commands/task/task-get.js

@@ -6,6 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TodoTaskGetCommand_instances, _TodoTaskGetCommand_initTelemetry, _TodoTaskGetCommand_initOptions, _TodoTaskGetCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import DelegatedGraphCommand from '../../../base/DelegatedGraphCommand.js';
 import commands from '../../commands.js';
 class TodoTaskGetCommand extends DelegatedGraphCommand {
@@ -30,7 +31,7 @@ class TodoTaskGetCommand extends DelegatedGraphCommand {
             return args.options.listId;
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${escape(args.options.listName)}'`,
+            url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${formatting.encodeQueryParameter(args.options.listName)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },

package/dist/m365/todo/commands/task/task-list.js

@@ -6,6 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TodoTaskListCommand_instances, _TodoTaskListCommand_initTelemetry, _TodoTaskListCommand_initOptions, _TodoTaskListCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import DelegatedGraphCommand from '../../../base/DelegatedGraphCommand.js';
 import commands from '../../commands.js';
@@ -31,7 +32,7 @@ class TodoTaskListCommand extends DelegatedGraphCommand {
             return args.options.listId;
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${escape(args.options.listName)}'`,
+            url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${formatting.encodeQueryParameter(args.options.listName)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },

package/dist/m365/todo/commands/task/task-remove.js

@@ -6,6 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TodoTaskRemoveCommand_instances, _TodoTaskRemoveCommand_initTelemetry, _TodoTaskRemoveCommand_initOptions, _TodoTaskRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import DelegatedGraphCommand from '../../../base/DelegatedGraphCommand.js';
 import commands from '../../commands.js';
 class TodoTaskRemoveCommand extends DelegatedGraphCommand {
@@ -37,7 +38,7 @@ class TodoTaskRemoveCommand extends DelegatedGraphCommand {
         if (options.listName) {
             // Search list by its name
             const requestOptions = {
-                url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${escape(options.listName)}'`,
+                url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${formatting.encodeQueryParameter(options.listName)}'`,
                 headers: {
                     accept: "application/json;odata.metadata=none"
                 },

package/dist/m365/todo/commands/task/task-set.js

@@ -50,7 +50,7 @@ class TodoTaskSetCommand extends DelegatedGraphCommand {
             return options.listId;
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${escape(options.listName)}'`,
+            url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${formatting.encodeQueryParameter(options.listName)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },

package/dist/utils/formatting.js

@@ -1,3 +1,4 @@
+import { parse } from 'csv-parse/sync';
 import chalk from 'chalk';
 import stripJsonComments from 'strip-json-comments';
 import { BasePermissions } from '../m365/spo/base-permissions.js';
@@ -75,26 +76,13 @@ export const formatting = {
         return response;
     },
     parseCsvToJson(s, quoteChar = '"', delimiter = ',') {
-        const regex = new RegExp(`\\s*(${quoteChar})?(.*?)\\1\\s*(?:${delimiter}|$)`, 'gs');
-        const lines = s.split('\n');
-        const match = (line) => [...line.matchAll(regex)]
-            .map(m => m[2]); // we only want the second capture group
-        const heads = match(lines[0]).slice(0, -1);
-        return lines.slice(1)
-            .filter(text => text.trim() !== '')
-            .map(line => {
-            const lineMatch = match(line);
-            const obj = {};
-            heads.forEach((key, index) => {
-                const value = parseInt(lineMatch[index]);
-                if (isNaN(value) || value.toString() !== lineMatch[index]) {
-                    obj[key] = lineMatch[index];
-                }
-                else {
-                    obj[key] = parseInt(lineMatch[index]);
-                }
-            });
-            return obj;
+        return parse(s, {
+            quote: quoteChar,
+            delimiter: delimiter,
+            columns: true,
+            skipEmptyLines: true,
+            ltrim: true,
+            cast: true
         });
     },
     encodeQueryParameter(value) {

package/dist/utils/spo.js

@@ -1,5 +1,4 @@
 import os from 'os';
-import url from 'url';
 import { urlUtil } from "./urlUtil.js";
 import { validation } from "./validation.js";
 import auth from '../Auth.js';
@@ -200,8 +199,10 @@ export const spo = {
      * @param siteAccessToken a valid access token for the site specified in the webFullUrl param
      */
     async ensureFolder(webFullUrl, folderToEnsure, logger, debug) {
-        const webUrl = url.parse(webFullUrl);
-        if (!webUrl.protocol || !webUrl.hostname) {
+        try {
+            new URL(webFullUrl);
+        }
+        catch {
             throw new Error('webFullUrl is not a valid URL');
         }
         if (!folderToEnsure) {
@@ -1060,7 +1061,7 @@ export const spo = {
                 headers: {
                     'X-RequestDigest': context.FormDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions>${payload.join('')}<ObjectPath Id="14" ObjectPathId="13" /><ObjectIdentityQuery Id="15" ObjectPathId="5" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="53d8499e-d0d2-5000-cb83-9ade5be42ca4|${tenantId.substr(pos, tenantId.indexOf('&') - pos)}&#xA;SiteProperties&#xA;${formatting.encodeQueryParameter(url)}" /><Method Id="13" ParentId="5" Name="Update" /></ObjectPaths></Request>`
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions>${payload.join('')}<ObjectPath Id="14" ObjectPathId="13" /><ObjectIdentityQuery Id="15" ObjectPathId="5" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="53d8499e-d0d2-5000-cb83-9ade5be42ca4|${tenantId.substring(pos, tenantId.indexOf('&'))}&#xA;SiteProperties&#xA;${formatting.encodeQueryParameter(url)}" /><Method Id="13" ParentId="5" Name="Update" /></ObjectPaths></Request>`
             };
             const res = await request.post(requestOptionsUpdateProperties);
             const json = JSON.parse(res);

package/dist/utils/spp.js

@@ -1,9 +1,9 @@
 import request from '../request.js';
 export const spp = {
     /**
-     * Asserts whether the specified site is a content center.
-     * @param siteUrl The URL of the site to check.
-     * @throws Error when the site is not a content center.
+     * Asserts whether the specified site is a content center
+     * @param siteUrl The URL of the site to check
+     * @throws error when site is not a content center.
      */
     async assertSiteIsContentCenter(siteUrl) {
         const requestOptions = {

package/dist/utils/urlUtil.js

@@ -1,4 +1,3 @@
-import url from 'url';
 export const urlUtil = {
     /**
        * Returns server relative path.
@@ -15,12 +14,7 @@ export const urlUtil = {
        * urlUtil.getServerRelativePath("/sites/team1/", "/Shared Documents");
        */
     getServerRelativePath(webUrl, folderRelativePath) {
-        const tenantUrl = `${url.parse(webUrl).protocol}//${url.parse(webUrl).hostname}`;
-        // if webUrl is a server-relative URL then tenantUrl will resolve to null//null
-        // in which case we should keep webUrl
-        let webRelativePath = tenantUrl !== 'null//null' ? webUrl.substr(tenantUrl.length) : webUrl;
-        // will be used to remove relative path from the folderRelativePath
-        // in case the web relative url is included
+        let webRelativePath = this.getUrlRelativePath(webUrl);
         let relativePathToRemove = webRelativePath;
         // add '/' at 0
         if (webRelativePath[0] !== '/') {
@@ -90,11 +84,8 @@ export const urlUtil = {
      * Utils.getWebRelativePath("/sites/team1/", "/sites/team1/Shared Documents");
      */
     getWebRelativePath(webUrl, folderUrl) {
+        let webRelativePath = this.getUrlRelativePath(webUrl);
         let folderWebRelativePath = '';
-        const tenantUrl = `${url.parse(webUrl).protocol}//${url.parse(webUrl).hostname}`;
-        // if webUrl is a server-relative URL then tenantUrl will resolve to null//null
-        // in which case we should keep webUrl
-        let webRelativePath = tenantUrl !== 'null//null' ? webUrl.substr(tenantUrl.length) : webUrl;
         // will be used to remove relative path from the folderRelativePath
         // in case the web relative url is included
         let relativePathToRemove = webRelativePath;
@@ -140,12 +131,11 @@ export const urlUtil = {
      * urlUtil.getAbsoluteUrl("https://contoso.sharepoint.com/sites/team1/", "/sites/team1/Lists/MyList");
      */
     getAbsoluteUrl(webUrl, serverRelativeUrl) {
-        const uri = url.parse(webUrl);
-        const tenantUrl = `${uri.protocol}//${uri.hostname}`;
+        const parsedUrl = new URL(webUrl);
         if (serverRelativeUrl[0] !== '/') {
             serverRelativeUrl = `/${serverRelativeUrl}`;
         }
-        return `${tenantUrl}${serverRelativeUrl}`;
+        return `${parsedUrl.origin}${serverRelativeUrl}`;
     },
     /**
      * Combines base and relative url considering any missing slashes
@@ -213,6 +203,13 @@ export const urlUtil = {
      */
     removeTrailingSlashes(url) {
         return url.replace(/\/+$/, '');
+    },
+    getUrlRelativePath(url) {
+        if (url.includes('://')) {
+            const parsedUrl = new URL(url);
+            return url.substring(parsedUrl.origin.length);
+        }
+        return url;
     }
 };
 //# sourceMappingURL=urlUtil.js.map