@pnp/cli-microsoft365 6.0.0-beta.566a6b8 → 6.0.0-beta.636d726

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

@@ -17,7 +17,10 @@ var _SpoListItemSetCommand_instances, _SpoListItemSetCommand_initTelemetry, _Spo
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListItemSetCommand extends SpoCommand_1.default {
@@ -41,35 +44,41 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const listIdArgument = args.options.listId || '';
-            const listTitleArgument = args.options.listTitle || '';
-            const listRestUrl = (args.options.listId ?
-                `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')`
-                : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(listTitleArgument)}')`);
             let contentTypeName = '';
-            let formDigestValue = '';
-            let environmentListId = '';
+            let listId = '';
             try {
-                if (args.options.systemUpdate) {
+                let requestUrl = `${args.options.webUrl}/_api/web`;
+                if (args.options.listId) {
+                    listId = args.options.listId;
+                    requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+                }
+                else if (args.options.listTitle) {
+                    requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                }
+                else if (args.options.listUrl) {
+                    const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                    requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+                }
+                if (args.options.systemUpdate && !args.options.listId) {
                     if (this.verbose) {
                         logger.logToStderr(`Getting list id...`);
                     }
                     const listRequestOptions = {
-                        url: `${listRestUrl}/id`,
+                        url: `${requestUrl}?$select=Id`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         },
                         responseType: 'json'
                     };
-                    const dataReturned = yield request_1.default.get(listRequestOptions);
-                    environmentListId = dataReturned.value;
+                    const list = yield request_1.default.get(listRequestOptions);
+                    listId = list.Id;
                 }
                 if (args.options.contentType) {
                     if (this.verbose) {
                         logger.logToStderr(`Getting content types for list...`);
                     }
                     const requestOptions = {
-                        url: `${listRestUrl}/contenttypes?$select=Name,Id`,
+                        url: `${requestUrl}/contenttypes?$select=Name,Id`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         },
@@ -107,12 +116,12 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
                     if (this.debug) {
                         logger.logToStderr(`getting request digest for systemUpdate request`);
                     }
-                    res = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                    res = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 }
                 if (this.verbose) {
-                    logger.logToStderr(`Updating item in list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}...`);
+                    logger.logToStderr(`Updating item in list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site ${args.options.webUrl}...`);
                 }
-                formDigestValue = args.options.systemUpdate ? res['FormDigestValue'] : '';
+                const formDigestValue = args.options.systemUpdate ? res['FormDigestValue'] : '';
                 let objectIdentity = '';
                 if (args.options.systemUpdate) {
                     objectIdentity = yield this.requestObjectIdentity(args.options.webUrl, logger, formDigestValue);
@@ -131,7 +140,7 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
             <Method Name="SystemUpdate" Id="2" ObjectPathId="147" />
           </Actions>
           <ObjectPaths>
-            <Identity Id="147" Name="${objectIdentity}:list:${environmentListId}:item:${args.options.id},1" />
+            <Identity Id="147" Name="${objectIdentity}:list:${listId}:item:${args.options.id},1" />
           </ObjectPaths>
         </Request>`
                     : {
@@ -156,7 +165,7 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
                         data: requestBody
                     } :
                     {
-                        url: `${listRestUrl}/items(${args.options.id})/ValidateUpdateListItem()`,
+                        url: `${requestUrl}/items(${args.options.id})/ValidateUpdateListItem()`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         },
@@ -184,7 +193,7 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
                     }
                 }
                 const requestOptionsItems = {
-                    url: `${listRestUrl}/items(${itemId})`,
+                    url: `${requestUrl}/items(${itemId})`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -203,6 +212,7 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
         const excludeOptions = [
             'listTitle',
             'listId',
+            'listUrl',
             'webUrl',
             'id',
             'contentType',
@@ -245,31 +255,28 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
      * @param cmd command cmd
      */
     requestObjectIdentity(webUrl, logger, formDigestValue) {
-        const requestOptions = {
-            url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
-            headers: {
-                'X-RequestDigest': formDigestValue
-            },
-            data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Query Id="1" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="ServerRelativeUrl" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /></ObjectPaths></Request>`
-        };
-        return new Promise((resolve, reject) => {
-            request_1.default.post(requestOptions).then((res) => {
-                if (this.debug) {
-                    logger.logToStderr('Attempt to get _ObjectIdentity_ key values');
-                }
-                const json = JSON.parse(res);
-                const contents = json.find(x => { return x['ErrorInfo']; });
-                if (contents && contents.ErrorInfo) {
-                    reject(contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error');
-                }
-                const identityObject = json.find(x => { return x['_ObjectIdentity_']; });
-                if (identityObject) {
-                    resolve(identityObject['_ObjectIdentity_']);
-                }
-                reject('Cannot proceed. _ObjectIdentity_ not found'); // this is not supposed to happen
-            }).catch((err) => {
-                reject(err);
-            });
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': formDigestValue
+                },
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Query Id="1" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="ServerRelativeUrl" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /></ObjectPaths></Request>`
+            };
+            const response = yield request_1.default.post(requestOptions);
+            if (this.debug) {
+                logger.logToStderr('Attempt to get _ObjectIdentity_ key values');
+            }
+            const json = JSON.parse(response);
+            const contents = json.find(x => { return x['ErrorInfo']; });
+            if (contents && contents.ErrorInfo) {
+                throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
+            }
+            const identityObject = json.find(x => { return x['_ObjectIdentity_']; });
+            if (identityObject) {
+                return identityObject['_ObjectIdentity_'];
+            }
+            throw 'Cannot proceed. _ObjectIdentity_ not found'; // this is not supposed to happen
         });
     }
 }
@@ -278,6 +285,7 @@ _SpoListItemSetCommand_instances = new WeakSet(), _SpoListItemSetCommand_initTel
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             contentType: typeof args.options.contentType !== 'undefined',
             systemUpdate: typeof args.options.systemUpdate !== 'undefined'
         });
@@ -291,6 +299,8 @@ _SpoListItemSetCommand_instances = new WeakSet(), _SpoListItemSetCommand_initTel
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-c, --contentType [contentType]'
     }, {
@@ -298,21 +308,21 @@ _SpoListItemSetCommand_instances = new WeakSet(), _SpoListItemSetCommand_initTel
     });
 }, _SpoListItemSetCommand_initValidators = function _SpoListItemSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.listId &&
-            !utils_1.validation.isValidGuid(args.options.listId)) {
+            !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
         return true;
     }));
 }, _SpoListItemSetCommand_initTypes = function _SpoListItemSetCommand_initTypes() {
-    this.types.string.push('webUrl', 'listId', 'listTitle', 'id', 'contentType');
+    this.types.string.push('webUrl', 'listId', 'listTitle', 'listUrl', 'id', 'contentType');
     this.types.boolean.push('systemUpdate');
 }, _SpoListItemSetCommand_initOptionSets = function _SpoListItemSetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListItemSetCommand();
 //# sourceMappingURL=listitem-set.js.map

package/dist/m365/spo/commands/mail/mail-send.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoMailSendCommand_instances, _SpoMailSendCommand_initTelemetry, _SpoMailSendCommand_initOptions, _SpoMailSendCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoMailSendCommand extends SpoCommand_1.default {
@@ -113,7 +113,7 @@ _SpoMailSendCommand_instances = new WeakSet(), _SpoMailSendCommand_initTelemetry
         option: '--additionalHeaders [additionalHeaders]'
     });
 }, _SpoMailSendCommand_initValidators = function _SpoMailSendCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
 module.exports = new SpoMailSendCommand();
 //# sourceMappingURL=mail-send.js.map

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoNavigationNodeAddCommand_instances, _SpoNavigationNodeAddCommand_initTelemetry, _SpoNavigationNodeAddCommand_initOptions, _SpoNavigationNodeAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoNavigationNodeAddCommand extends SpoCommand_1.default {
@@ -91,7 +91,7 @@ _SpoNavigationNodeAddCommand_instances = new WeakSet(), _SpoNavigationNodeAddCom
     });
 }, _SpoNavigationNodeAddCommand_initValidators = function _SpoNavigationNodeAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoNavigationNodeListCommand_instances, _SpoNavigationNodeListCommand_initTelemetry, _SpoNavigationNodeListCommand_initOptions, _SpoNavigationNodeListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoNavigationNodeListCommand extends SpoCommand_1.default {
@@ -76,7 +76,7 @@ _SpoNavigationNodeListCommand_instances = new WeakSet(), _SpoNavigationNodeListC
     });
 }, _SpoNavigationNodeListCommand_initValidators = function _SpoNavigationNodeListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoNavigationNodeRemoveCommand_instances, _SpoNavigationNodeRemoveCommand_initTelemetry, _SpoNavigationNodeRemoveCommand_initOptions, _SpoNavigationNodeRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoNavigationNodeRemoveCommand extends SpoCommand_1.default {
@@ -38,7 +39,7 @@ class SpoNavigationNodeRemoveCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const removeNode = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const res = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                    const res = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                     if (this.verbose) {
                         logger.logToStderr(`Removing navigation node...`);
                     }
@@ -60,7 +61,7 @@ class SpoNavigationNodeRemoveCommand extends SpoCommand_1.default {
                 yield removeNode();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -93,7 +94,7 @@ _SpoNavigationNodeRemoveCommand_instances = new WeakSet(), _SpoNavigationNodeRem
     });
 }, _SpoNavigationNodeRemoveCommand_initValidators = function _SpoNavigationNodeRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

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

@@ -17,7 +17,8 @@ var _SpoOrgAssetsLibraryAddCommand_instances, _SpoOrgAssetsLibraryAddCommand_ini
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoOrgAssetsLibraryAddCommand extends SpoCommand_1.default {
@@ -41,8 +42,8 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand_1.default {
             const cdnType = cdnTypeString === 'Private' ? 1 : 0;
             const thumbnailSchema = typeof args.options.thumbnailUrl === 'undefined' ? `<Parameter Type="Null" />` : `<Parameter Type="String">${args.options.thumbnailUrl}</Parameter>`;
             try {
-                spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
-                const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 const requestOptions = {
                     url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
@@ -81,11 +82,11 @@ _SpoOrgAssetsLibraryAddCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryAd
     });
 }, _SpoOrgAssetsLibraryAddCommand_initValidators = function _SpoOrgAssetsLibraryAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidThumbnailUrl = utils_1.validation.isValidSharePointUrl(args.options.thumbnailUrl);
+        const isValidThumbnailUrl = validation_1.validation.isValidSharePointUrl(args.options.thumbnailUrl);
         if (typeof args.options.thumbnailUrl !== 'undefined' && isValidThumbnailUrl !== true) {
             return isValidThumbnailUrl;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.libraryUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.libraryUrl);
     }));
 };
 module.exports = new SpoOrgAssetsLibraryAddCommand();

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

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoOrgAssetsLibraryListCommand extends SpoCommand_1.default {
@@ -24,8 +24,8 @@ class SpoOrgAssetsLibraryListCommand extends SpoCommand_1.default {
     commandAction(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
-                const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 const requestOptions = {
                     url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {

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

@@ -15,10 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoOrgAssetsLibraryRemoveCommand_instances, _SpoOrgAssetsLibraryRemoveCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoOrgAssetsLibraryRemoveCommand extends SpoCommand_1.default {
@@ -37,8 +37,8 @@ class SpoOrgAssetsLibraryRemoveCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const removeLibrary = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
-                    const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                    const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                    const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                     const requestOptions = {
                         url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                         headers: {
@@ -64,7 +64,7 @@ class SpoOrgAssetsLibraryRemoveCommand extends SpoCommand_1.default {
                 yield removeLibrary();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,

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

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoOrgNewsSiteListCommand extends SpoCommand_1.default {
@@ -24,8 +24,8 @@ class SpoOrgNewsSiteListCommand extends SpoCommand_1.default {
     commandAction(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
-                const resDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const resDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 const requestOptions = {
                     url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {

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

@@ -15,10 +15,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoOrgNewsSiteRemoveCommand_instances, _SpoOrgNewsSiteRemoveCommand_initTelemetry, _SpoOrgNewsSiteRemoveCommand_initOptions, _SpoOrgNewsSiteRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoOrgNewsSiteRemoveCommand extends SpoCommand_1.default {
@@ -39,14 +41,14 @@ class SpoOrgNewsSiteRemoveCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const removeOrgNewsSite = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
-                    const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                    const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                    const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                     const requestOptions = {
                         url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                         headers: {
                             'X-RequestDigest': reqDigest.FormDigestValue
                         },
-                        data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="64" ObjectPathId="63" /><Method Name="RemoveOrgNewsSite" Id="65" ObjectPathId="63"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="63" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                        data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="64" ObjectPathId="63" /><Method Name="RemoveOrgNewsSite" Id="65" ObjectPathId="63"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="63" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                     };
                     const res = yield request_1.default.post(requestOptions);
                     const json = JSON.parse(res);
@@ -63,7 +65,7 @@ class SpoOrgNewsSiteRemoveCommand extends SpoCommand_1.default {
                 yield removeOrgNewsSite();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -89,7 +91,7 @@ _SpoOrgNewsSiteRemoveCommand_instances = new WeakSet(), _SpoOrgNewsSiteRemoveCom
         option: '--confirm'
     });
 }, _SpoOrgNewsSiteRemoveCommand_initValidators = function _SpoOrgNewsSiteRemoveCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoOrgNewsSiteRemoveCommand();
 //# sourceMappingURL=orgnewssite-remove.js.map

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

@@ -17,7 +17,9 @@ var _SpoOrgNewsSiteSetCommand_instances, _SpoOrgNewsSiteSetCommand_initOptions,
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoOrgNewsSiteSetCommand extends SpoCommand_1.default {
@@ -36,14 +38,14 @@ class SpoOrgNewsSiteSetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
-                const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 const requestOptions = {
                     url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
                         'X-RequestDigest': reqDigest.FormDigestValue
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="61" ObjectPathId="60" /><Method Name="SetOrgNewsSite" Id="62" ObjectPathId="60"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="60" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="61" ObjectPathId="60" /><Method Name="SetOrgNewsSite" Id="62" ObjectPathId="60"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="60" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);
@@ -63,7 +65,7 @@ _SpoOrgNewsSiteSetCommand_instances = new WeakSet(), _SpoOrgNewsSiteSetCommand_i
         option: '-u, --url <url>'
     });
 }, _SpoOrgNewsSiteSetCommand_initValidators = function _SpoOrgNewsSiteSetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoOrgNewsSiteSetCommand();
 //# sourceMappingURL=orgnewssite-set.js.map

package/dist/m365/spo/commands/page/Page.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Page = exports.supportedPromoteAs = exports.supportedPageLayouts = void 0;
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const clientsidepages_1 = require("./clientsidepages");
 const pageMethods_1 = require("./pageMethods");
 exports.supportedPageLayouts = ['Article', 'Home', 'SingleWebPartAppPage', 'RepostPage', 'HeaderlessSearchResults', 'Spaces', 'Topic'];
@@ -15,7 +15,7 @@ class Page {
             }
             const pageName = this.getPageNameWithExtension(name);
             const requestOptions = {
-                url: `${webUrl}/_api/web/getfilebyserverrelativeurl('${utils_1.urlUtil.getServerRelativeSiteUrl(webUrl)}/SitePages/${encodeURIComponent(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId`,
+                url: `${webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(webUrl)}/SitePages/${encodeURIComponent(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId`,
                 headers: {
                     'content-type': 'application/json;charset=utf-8',
                     accept: 'application/json;odata=nometadata'

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

@@ -17,7 +17,9 @@ var _SpoPageAddCommand_instances, _SpoPageAddCommand_initTelemetry, _SpoPageAddC
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const Page_1 = require("./Page");
@@ -41,7 +43,7 @@ class SpoPageAddCommand extends SpoCommand_1.default {
             let requestDigest = '';
             let itemId = '';
             let pageName = args.options.name;
-            const serverRelativeSiteUrl = utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl);
+            const serverRelativeSiteUrl = urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl);
             const fileNameWithoutExtension = pageName.replace('.aspx', '');
             let bannerImageUrl = '';
             let canvasContent1 = '';
@@ -50,7 +52,7 @@ class SpoPageAddCommand extends SpoCommand_1.default {
             let pageId = null;
             const pageDescription = args.options.description || "";
             try {
-                const reqDigest = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 requestDigest = reqDigest.FormDigestValue;
                 if (!pageName.endsWith('.aspx')) {
                     pageName += '.aspx';
@@ -296,7 +298,7 @@ _SpoPageAddCommand_instances = new WeakSet(), _SpoPageAddCommand_initTelemetry =
     });
 }, _SpoPageAddCommand_initValidators = function _SpoPageAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

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

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("util");
 const uuid_1 = require("uuid");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const StandardWebPartTypes_1 = require("../../StandardWebPartTypes");
@@ -368,7 +368,7 @@ _SpoPageClientSideWebPartAddCommand_instances = new WeakSet(), _SpoPageClientSid
         if (args.options.standardWebPart && args.options.webPartId) {
             return 'Specify either the standardWebPart or the webPartId option but not both';
         }
-        if (args.options.webPartId && !utils_1.validation.isValidGuid(args.options.webPartId)) {
+        if (args.options.webPartId && !validation_1.validation.isValidGuid(args.options.webPartId)) {
             return `The webPartId '${args.options.webPartId}' is not a valid GUID`;
         }
         if (args.options.standardWebPart && !StandardWebPartTypes_1.StandardWebPartUtils.isValidStandardWebPartType(args.options.standardWebPart)) {
@@ -401,7 +401,7 @@ _SpoPageClientSideWebPartAddCommand_instances = new WeakSet(), _SpoPageClientSid
         if (args.options.column && (!(0, util_1.isNumber)(args.options.column) || args.options.column < 1)) {
             return 'The value of parameter column must be 1 or higher';
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoPageClientSideWebPartAddCommand();

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

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageColumnGetCommand_instances, _SpoPageColumnGetCommand_initOptions, _SpoPageColumnGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const Page_1 = require("./Page");
@@ -78,7 +78,7 @@ _SpoPageColumnGetCommand_instances = new WeakSet(), _SpoPageColumnGetCommand_ini
         if (isNaN(args.options.column)) {
             return `${args.options.column} is not a number`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoPageColumnGetCommand();