@pnp/cli-microsoft365 7.0.0-beta.99e75a7 → 7.0.0-beta.aa2d71e

package/dist/m365/spo/commands/folder/folder-copy.js

@@ -3,10 +3,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoFolderCopyCommand_instances, _SpoFolderCopyCommand_initTelemetry, _SpoFolderCopyCommand_initOptions, _SpoFolderCopyCommand_initValidators;
-import url from 'url';
+var _SpoFolderCopyCommand_instances, _SpoFolderCopyCommand_initTelemetry, _SpoFolderCopyCommand_initOptions, _SpoFolderCopyCommand_initValidators, _SpoFolderCopyCommand_initOptionSets;
 import request from '../../../../request.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';
@@ -21,77 +19,123 @@ class SpoFolderCopyCommand extends SpoCommand {
     constructor() {
         super();
         _SpoFolderCopyCommand_instances.add(this);
+        this.nameConflictBehaviorOptions = ['fail', 'rename'];
         __classPrivateFieldGet(this, _SpoFolderCopyCommand_instances, "m", _SpoFolderCopyCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFolderCopyCommand_instances, "m", _SpoFolderCopyCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFolderCopyCommand_instances, "m", _SpoFolderCopyCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFolderCopyCommand_instances, "m", _SpoFolderCopyCommand_initOptionSets).call(this);
     }
     getExcludedOptionsWithUrls() {
         return ['targetUrl', 'sourceUrl'];
     }
     async commandAction(logger, args) {
-        const webUrl = args.options.webUrl;
-        const parsedUrl = url.parse(webUrl);
-        const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
-        const serverRelativePath = urlUtil.getServerRelativePath(webUrl, args.options.sourceUrl);
-        const sourceAbsoluteUrl = urlUtil.urlCombine(tenantUrl, serverRelativePath);
-        const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-        const requestOptions = {
-            url: urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs'),
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            data: {
-                exportObjectUris: [sourceAbsoluteUrl],
-                destinationUri: urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
-                options: {
-                    "AllowSchemaMismatch": allowSchemaMismatch,
-                    "IgnoreVersionHistory": true
-                }
-            },
-            responseType: 'json'
-        };
         try {
-            const jobInfo = await request.post(requestOptions);
-            const copyJobInfo = jobInfo.value[0];
-            const progressPollInterval = 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
-            await new Promise((resolve, reject) => {
-                setTimeout(() => {
-                    spo.waitUntilCopyJobFinished({
-                        copyJobInfo,
-                        siteUrl: webUrl,
-                        pollingInterval: progressPollInterval,
-                        resolve,
-                        reject,
-                        logger,
-                        debug: this.debug,
-                        verbose: this.verbose
-                    });
-                }, progressPollInterval);
-            });
+            const sourcePath = await this.getSourcePath(logger, args.options);
+            if (this.verbose) {
+                await logger.logToStderr(`Copying folder ${sourcePath} to ${args.options.targetUrl}...`);
+            }
+            const absoluteSourcePath = this.getAbsoluteUrl(args.options.webUrl, sourcePath);
+            let absoluteTargetPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl) + '/';
+            if (args.options.newName) {
+                absoluteTargetPath += args.options.newName;
+            }
+            else {
+                // Keep the original folder name
+                absoluteTargetPath += sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
+            }
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/SP.MoveCopyUtil.CopyFolderByPath`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json',
+                data: {
+                    srcPath: {
+                        DecodedUrl: absoluteSourcePath
+                    },
+                    destPath: {
+                        DecodedUrl: absoluteTargetPath
+                    },
+                    options: {
+                        KeepBoth: args.options.nameConflictBehavior === 'rename',
+                        ShouldBypassSharedLocks: !!args.options.bypassSharedLock,
+                        ResetAuthorAndCreatedOnCopy: !!args.options.resetAuthorAndCreated
+                    }
+                }
+            };
+            await request.post(requestOptions);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    async getSourcePath(logger, options) {
+        if (options.sourceUrl) {
+            return urlUtil.getServerRelativePath(options.webUrl, options.sourceUrl);
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving server-relative path for folder with ID '${options.sourceId}'...`);
+        }
+        const requestOptions = {
+            url: `${options.webUrl}/_api/Web/GetFolderById('${options.sourceId}')?$select=ServerRelativePath`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const file = await request.get(requestOptions);
+        return file.ServerRelativePath.DecodedUrl;
+    }
+    getAbsoluteUrl(webUrl, url) {
+        return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+    }
 }
 _SpoFolderCopyCommand_instances = new WeakSet(), _SpoFolderCopyCommand_initTelemetry = function _SpoFolderCopyCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            allowSchemaMismatch: args.options.allowSchemaMismatch || false
+            sourceUrl: typeof args.options.sourceUrl !== 'undefined',
+            sourceId: typeof args.options.sourceId !== 'undefined',
+            newName: typeof args.options.newName !== 'undefined',
+            nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined',
+            resetAuthorAndCreated: !!args.options.resetAuthorAndCreated,
+            bypassSharedLock: !!args.options.bypassSharedLock
         });
     });
 }, _SpoFolderCopyCommand_initOptions = function _SpoFolderCopyCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-s, --sourceUrl <sourceUrl>'
+        option: '-s, --sourceUrl [sourceUrl]'
+    }, {
+        option: '-i, --sourceId [sourceId]'
     }, {
         option: '-t, --targetUrl <targetUrl>'
     }, {
-        option: '--allowSchemaMismatch'
+        option: '--newName [newName]'
+    }, {
+        option: '--nameConflictBehavior [nameConflictBehavior]',
+        autocomplete: this.nameConflictBehaviorOptions
+    }, {
+        option: '--resetAuthorAndCreated'
+    }, {
+        option: '--bypassSharedLock'
     });
 }, _SpoFolderCopyCommand_initValidators = function _SpoFolderCopyCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
+    this.validators.push(async (args) => {
+        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.sourceId && !validation.isValidGuid(args.options.sourceId)) {
+            return `'${args.options.sourceId}' is not a valid GUID for sourceId.`;
+        }
+        if (args.options.nameConflictBehavior && this.nameConflictBehaviorOptions.indexOf(args.options.nameConflictBehavior) === -1) {
+            return `'${args.options.nameConflictBehavior}' is not a valid value for nameConflictBehavior. Allowed values are: ${this.nameConflictBehaviorOptions.join(', ')}.`;
+        }
+        return true;
+    });
+}, _SpoFolderCopyCommand_initOptionSets = function _SpoFolderCopyCommand_initOptionSets() {
+    this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
 };
 export default new SpoFolderCopyCommand();
 //# sourceMappingURL=folder-copy.js.map

package/dist/m365/spo/commands/folder/folder-move.js

@@ -3,10 +3,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoFolderMoveCommand_instances, _SpoFolderMoveCommand_initTelemetry, _SpoFolderMoveCommand_initOptions, _SpoFolderMoveCommand_initValidators;
-import url from 'url';
+var _SpoFolderMoveCommand_instances, _SpoFolderMoveCommand_initTelemetry, _SpoFolderMoveCommand_initOptions, _SpoFolderMoveCommand_initValidators, _SpoFolderMoveCommand_initOptionSets;
 import request from '../../../../request.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';
@@ -21,79 +19,123 @@ class SpoFolderMoveCommand extends SpoCommand {
     constructor() {
         super();
         _SpoFolderMoveCommand_instances.add(this);
+        this.nameConflictBehaviorOptions = ['fail', 'rename'];
         __classPrivateFieldGet(this, _SpoFolderMoveCommand_instances, "m", _SpoFolderMoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFolderMoveCommand_instances, "m", _SpoFolderMoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFolderMoveCommand_instances, "m", _SpoFolderMoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFolderMoveCommand_instances, "m", _SpoFolderMoveCommand_initOptionSets).call(this);
     }
     getExcludedOptionsWithUrls() {
         return ['targetUrl', 'sourceUrl'];
     }
     async commandAction(logger, args) {
-        const webUrl = args.options.webUrl;
-        const parsedUrl = url.parse(webUrl);
-        const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
-        const sourceRelUrl = urlUtil.getServerRelativePath(webUrl, args.options.sourceUrl);
-        const sourceAbsoluteUrl = urlUtil.urlCombine(tenantUrl, sourceRelUrl);
-        const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-        const requestUrl = urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            data: {
-                exportObjectUris: [sourceAbsoluteUrl],
-                destinationUri: urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
-                options: {
-                    "AllowSchemaMismatch": allowSchemaMismatch,
-                    "IgnoreVersionHistory": true,
-                    "IsMoveMode": true
-                }
-            },
-            responseType: 'json'
-        };
         try {
-            const jobInfo = await request.post(requestOptions);
-            const copyJobInfo = jobInfo.value[0];
-            const progressPollInterval = 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
-            await new Promise((resolve, reject) => {
-                setTimeout(() => {
-                    spo.waitUntilCopyJobFinished({
-                        copyJobInfo,
-                        siteUrl: webUrl,
-                        pollingInterval: progressPollInterval,
-                        resolve,
-                        reject,
-                        logger,
-                        debug: this.debug,
-                        verbose: this.verbose
-                    });
-                }, progressPollInterval);
-            });
+            const sourcePath = await this.getSourcePath(logger, args.options);
+            if (this.verbose) {
+                await logger.logToStderr(`Moving folder '${sourcePath}' to '${args.options.targetUrl}'...`);
+            }
+            const absoluteSourcePath = this.getAbsoluteUrl(args.options.webUrl, sourcePath);
+            let absoluteTargetPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl) + '/';
+            if (args.options.newName) {
+                absoluteTargetPath += args.options.newName;
+            }
+            else {
+                // Keep the original file name
+                absoluteTargetPath += sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
+            }
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/SP.MoveCopyUtil.MoveFolderByPath`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json',
+                data: {
+                    srcPath: {
+                        DecodedUrl: absoluteSourcePath
+                    },
+                    destPath: {
+                        DecodedUrl: absoluteTargetPath
+                    },
+                    options: {
+                        KeepBoth: args.options.nameConflictBehavior === 'rename',
+                        ShouldBypassSharedLocks: !!args.options.bypassSharedLock,
+                        RetainEditorAndModifiedOnMove: !!args.options.retainEditorAndModified
+                    }
+                }
+            };
+            await request.post(requestOptions);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    async getSourcePath(logger, options) {
+        if (options.sourceUrl) {
+            return urlUtil.getServerRelativePath(options.webUrl, options.sourceUrl);
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving server-relative path for folder with ID '${options.sourceId}'...`);
+        }
+        const requestOptions = {
+            url: `${options.webUrl}/_api/Web/GetFolderById('${options.sourceId}')?$select=ServerRelativePath`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const file = await request.get(requestOptions);
+        return file.ServerRelativePath.DecodedUrl;
+    }
+    getAbsoluteUrl(webUrl, url) {
+        return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+    }
 }
 _SpoFolderMoveCommand_instances = new WeakSet(), _SpoFolderMoveCommand_initTelemetry = function _SpoFolderMoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            allowSchemaMismatch: args.options.allowSchemaMismatch || false
+            sourceUrl: typeof args.options.sourceUrl !== 'undefined',
+            sourceId: typeof args.options.sourceId !== 'undefined',
+            newName: typeof args.options.newName !== 'undefined',
+            nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined',
+            retainEditorAndModified: !!args.options.retainEditorAndModified,
+            bypassSharedLock: !!args.options.bypassSharedLock
         });
     });
 }, _SpoFolderMoveCommand_initOptions = function _SpoFolderMoveCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-s, --sourceUrl <sourceUrl>'
+        option: '-s, --sourceUrl [sourceUrl]'
+    }, {
+        option: '-i, --sourceId [sourceId]'
     }, {
         option: '-t, --targetUrl <targetUrl>'
     }, {
-        option: '--allowSchemaMismatch'
+        option: '--newName [newName]'
+    }, {
+        option: '--nameConflictBehavior [nameConflictBehavior]',
+        autocomplete: this.nameConflictBehaviorOptions
+    }, {
+        option: '--retainEditorAndModified'
+    }, {
+        option: '--bypassSharedLock'
     });
 }, _SpoFolderMoveCommand_initValidators = function _SpoFolderMoveCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
+    this.validators.push(async (args) => {
+        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.sourceId && !validation.isValidGuid(args.options.sourceId)) {
+            return `'${args.options.sourceId}' is not a valid GUID for sourceId.`;
+        }
+        if (args.options.nameConflictBehavior && this.nameConflictBehaviorOptions.indexOf(args.options.nameConflictBehavior) === -1) {
+            return `'${args.options.nameConflictBehavior}' is not a valid value for nameConflictBehavior. Allowed values are: ${this.nameConflictBehaviorOptions.join(', ')}.`;
+        }
+        return true;
+    });
+}, _SpoFolderMoveCommand_initOptionSets = function _SpoFolderMoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
 };
 export default new SpoFolderMoveCommand();
 //# sourceMappingURL=folder-move.js.map

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

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoListAddCommand_instances, _SpoListAddCommand_initTelemetry, _SpoListAddCommand_initOptions, _SpoListAddCommand_initValidators, _SpoListAddCommand_initTypes;
+var _SpoListAddCommand_instances, _a, _SpoListAddCommand_initTelemetry, _SpoListAddCommand_initOptions, _SpoListAddCommand_initValidators, _SpoListAddCommand_initTypes;
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -275,7 +275,7 @@ class SpoListAddCommand extends SpoCommand {
         return requestBody;
     }
 }
-_SpoListAddCommand_instances = new WeakSet(), _SpoListAddCommand_initTelemetry = function _SpoListAddCommand_initTelemetry() {
+_a = SpoListAddCommand, _SpoListAddCommand_instances = new WeakSet(), _SpoListAddCommand_initTelemetry = function _SpoListAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         const telemetryProps = {};
         // add properties with identifiable data
@@ -298,7 +298,7 @@ _SpoListAddCommand_instances = new WeakSet(), _SpoListAddCommand_initTelemetry =
             }
         });
         // add boolean values
-        SpoListAddCommand.booleanOptions.forEach(o => {
+        _a.booleanOptions.forEach(o => {
             const value = args.options[o];
             if (value !== undefined) {
                 telemetryProps[o] = value.toString();
@@ -561,7 +561,7 @@ _SpoListAddCommand_instances = new WeakSet(), _SpoListAddCommand_initTelemetry =
     });
 }, _SpoListAddCommand_initTypes = function _SpoListAddCommand_initTypes() {
     this.types.string.push('title', 'baseTemplate', 'webUrl', 'templateFeatureId', 'defaultContentApprovalWorkflowId', 'draftVersionVisibility', 'listExperienceOptions');
-    this.types.boolean.push(...SpoListAddCommand.booleanOptions);
+    this.types.boolean.push(..._a.booleanOptions);
 };
 SpoListAddCommand.booleanOptions = [
     'allowDeletion',

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

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoListSetCommand_instances, _SpoListSetCommand_initTelemetry, _SpoListSetCommand_initOptions, _SpoListSetCommand_initValidators, _SpoListSetCommand_initTypes, _SpoListSetCommand_initOptionSets;
+var _SpoListSetCommand_instances, _a, _SpoListSetCommand_initTelemetry, _SpoListSetCommand_initOptions, _SpoListSetCommand_initValidators, _SpoListSetCommand_initTypes, _SpoListSetCommand_initOptionSets;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
@@ -277,7 +277,7 @@ class SpoListSetCommand extends SpoCommand {
         return requestBody;
     }
 }
-_SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry = function _SpoListSetCommand_initTelemetry() {
+_a = SpoListSetCommand, _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry = function _SpoListSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         const telemetryProps = {};
         // add properties with identifiable data
@@ -303,7 +303,7 @@ _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry =
             }
         });
         // add boolean values
-        SpoListSetCommand.booleanOptions.forEach(o => {
+        _a.booleanOptions.forEach(o => {
             const value = args.options[o];
             if (value !== undefined) {
                 telemetryProps[o] = value;
@@ -565,7 +565,7 @@ _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry =
     });
 }, _SpoListSetCommand_initTypes = function _SpoListSetCommand_initTypes() {
     this.types.string.push('webUrl', 'templateFeatureId', 'defaultContentApprovalWorkflowId', 'draftVersionVisibility', 'listExperienceOptions');
-    this.types.boolean.push(...SpoListSetCommand.booleanOptions);
+    this.types.boolean.push(..._a.booleanOptions);
 }, _SpoListSetCommand_initOptionSets = function _SpoListSetCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'title', 'url'] });
 };

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

@@ -3,13 +3,19 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoOrgAssetsLibraryAddCommand_instances, _SpoOrgAssetsLibraryAddCommand_initTelemetry, _SpoOrgAssetsLibraryAddCommand_initOptions, _SpoOrgAssetsLibraryAddCommand_initValidators;
+var _SpoOrgAssetsLibraryAddCommand_instances, _a, _SpoOrgAssetsLibraryAddCommand_initTelemetry, _SpoOrgAssetsLibraryAddCommand_initOptions, _SpoOrgAssetsLibraryAddCommand_initValidators;
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+var OrgAssetType;
+(function (OrgAssetType) {
+    OrgAssetType[OrgAssetType["ImageDocumentLibrary"] = 1] = "ImageDocumentLibrary";
+    OrgAssetType[OrgAssetType["OfficeTemplateLibrary"] = 2] = "OfficeTemplateLibrary";
+    OrgAssetType[OrgAssetType["OfficeFontLibrary"] = 4] = "OfficeFontLibrary";
+})(OrgAssetType || (OrgAssetType = {}));
 class SpoOrgAssetsLibraryAddCommand extends SpoCommand {
     get name() {
         return commands.ORGASSETSLIBRARY_ADD;
@@ -30,6 +36,7 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand {
         const cdnType = cdnTypeString === 'Private' ? 1 : 0;
         const thumbnailSchema = typeof args.options.thumbnailUrl === 'undefined' ? `<Parameter Type="Null" />` : `<Parameter Type="String">${args.options.thumbnailUrl}</Parameter>`;
         try {
+            const orgAssetType = this.getOrgAssetType(args.options.orgAssetType);
             spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             const reqDigest = await spo.getRequestDigest(spoAdminUrl);
             const requestOptions = {
@@ -37,7 +44,7 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand {
                 headers: {
                     'X-RequestDigest': reqDigest.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><Method Name="AddToOrgAssetsLibAndCdnWithType" Id="11" ObjectPathId="8"><Parameters><Parameter Type="Enum">${cdnType}</Parameter><Parameter Type="String">${args.options.libraryUrl}</Parameter>${thumbnailSchema}<Parameter Type="Enum">1</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="8" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></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><Method Name="AddToOrgAssetsLibAndCdnWithType" Id="11" ObjectPathId="8"><Parameters><Parameter Type="Enum">${cdnType}</Parameter><Parameter Type="String">${args.options.libraryUrl}</Parameter>${thumbnailSchema}<Parameter Type="Enum">${orgAssetType}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="8" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
             };
             const res = await request.post(requestOptions);
             const json = JSON.parse(res);
@@ -50,12 +57,23 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand {
             this.handleRejectedPromise(err);
         }
     }
+    getOrgAssetType(orgAssetType) {
+        switch (orgAssetType) {
+            case 'OfficeTemplateLibrary':
+                return OrgAssetType.OfficeTemplateLibrary;
+            case 'OfficeFontLibrary':
+                return OrgAssetType.OfficeFontLibrary;
+            default:
+                return OrgAssetType.ImageDocumentLibrary;
+        }
+    }
 }
-_SpoOrgAssetsLibraryAddCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryAddCommand_initTelemetry = function _SpoOrgAssetsLibraryAddCommand_initTelemetry() {
+_a = SpoOrgAssetsLibraryAddCommand, _SpoOrgAssetsLibraryAddCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryAddCommand_initTelemetry = function _SpoOrgAssetsLibraryAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             cdnType: args.options.cdnType || 'Private',
-            thumbnailUrl: typeof args.options.thumbnailUrl !== 'undefined'
+            thumbnailUrl: typeof args.options.thumbnailUrl !== 'undefined',
+            orgAssetType: args.options.orgAssetType
         });
     });
 }, _SpoOrgAssetsLibraryAddCommand_initOptions = function _SpoOrgAssetsLibraryAddCommand_initOptions() {
@@ -65,7 +83,10 @@ _SpoOrgAssetsLibraryAddCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryAd
         option: '--thumbnailUrl [thumbnailUrl]'
     }, {
         option: '--cdnType [cdnType]',
-        autocomplete: ['Public', 'Private']
+        autocomplete: _a.cdnTypes
+    }, {
+        option: '--orgAssetType [orgAssetType]',
+        autocomplete: _a.orgAssetTypes
     });
 }, _SpoOrgAssetsLibraryAddCommand_initValidators = function _SpoOrgAssetsLibraryAddCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -73,8 +94,16 @@ _SpoOrgAssetsLibraryAddCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryAd
         if (typeof args.options.thumbnailUrl !== 'undefined' && isValidThumbnailUrl !== true) {
             return isValidThumbnailUrl;
         }
+        if (args.options.cdnType && _a.cdnTypes.indexOf(args.options.cdnType) < 0) {
+            return `${args.options.cdnType} is not a valid value for cdnType. Valid values are ${_a.cdnTypes.join(', ')}`;
+        }
+        if (args.options.orgAssetType && _a.orgAssetTypes.indexOf(args.options.orgAssetType) < 0) {
+            return `${args.options.orgAssetType} is not a valid value for orgAssetType. Valid values are ${_a.orgAssetTypes.join(', ')}`;
+        }
         return validation.isValidSharePointUrl(args.options.libraryUrl);
     });
 };
+SpoOrgAssetsLibraryAddCommand.orgAssetTypes = ['ImageDocumentLibrary', 'OfficeTemplateLibrary', 'OfficeFontLibrary'];
+SpoOrgAssetsLibraryAddCommand.cdnTypes = ['Public', 'Private'];
 export default new SpoOrgAssetsLibraryAddCommand();
 //# sourceMappingURL=orgassetslibrary-add.js.map