@pnp/cli-microsoft365 12.0.0-beta.1752794 → 12.0.0-beta.235caf5

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

@@ -1,15 +1,65 @@
-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 _SpoCustomActionSetCommand_instances, _SpoCustomActionSetCommand_initTelemetry, _SpoCustomActionSetCommand_initOptions, _SpoCustomActionSetCommand_initValidators;
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
+import { zod } from '../../../../utils/zod.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import { BasePermissions, PermissionKind } from '../../base-permissions.js';
 import commands from '../../commands.js';
+import { z } from 'zod';
+const permissionKinds = Object.entries(PermissionKind)
+    .filter(([, value]) => typeof value === 'number')
+    .map(([key]) => key);
+const permissionKindSet = new Set(permissionKinds);
+const registrationTypes = {
+    None: 'None',
+    List: 'List',
+    ContentType: 'ContentType',
+    ProgId: 'ProgId',
+    FileType: 'FileType'
+};
+const registrationTypeValues = Object.values(registrationTypes);
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string().refine(val => validation.isValidSharePointUrl(val) === true, {
+        error: e => `${e.input} is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        error: e => `${e.input} is not valid. Custom action id (Guid) expected`
+    }).alias('i'),
+    name: z.string().optional().alias('n'),
+    title: z.string().optional().alias('t'),
+    location: z.string().optional().alias('l'),
+    group: z.string().optional().alias('g'),
+    description: z.string().optional().alias('d'),
+    sequence: z.coerce.number().refine(val => val >= 0 && val <= 65536, {
+        message: 'Invalid option sequence. Expected value in range from 0 to 65536'
+    }).optional(),
+    actionUrl: z.string().optional(),
+    imageUrl: z.string().optional(),
+    commandUIExtension: z.string().optional().alias('e'),
+    registrationId: z.string().optional(),
+    registrationType: zod.coercedEnum(registrationTypes)
+        .optional()
+        .autocomplete(registrationTypeValues),
+    rights: z.string().refine(val => {
+        const items = val.split(',').map(item => item.trim());
+        return items.every(item => permissionKindSet.has(item));
+    }, {
+        error: e => {
+            const items = e.input.split(',').map(item => item.trim());
+            const invalid = items.find(item => !permissionKindSet.has(item));
+            return `Rights option '${invalid}' is not recognized as valid PermissionKind choice. Please note it is case sensitive`;
+        }
+    }).optional().autocomplete(permissionKinds),
+    scriptSrc: z.string().optional(),
+    scriptBlock: z.string().optional(),
+    scope: z.enum(['Site', 'Web', 'All']).optional().alias('s'),
+    clientSideComponentId: z.string().refine(val => validation.isValidGuid(val), {
+        error: e => `ClientSideComponentId ${e.input} is not a valid GUID`
+    }).optional().alias('c'),
+    clientSideComponentProperties: z.string().optional().alias('p')
+});
 class SpoCustomActionSetCommand extends SpoCommand {
     get name() {
         return commands.CUSTOMACTION_SET;
@@ -17,25 +67,25 @@ class SpoCustomActionSetCommand extends SpoCommand {
     get description() {
         return 'Updates a user custom action for site or site collection';
     }
-    /**
-     * Maps the base PermissionsKind enum to string array so it can
-     * more easily be used in validation or descriptions.
-     */
-    get permissionsKindMap() {
-        const result = [];
-        for (const kind in PermissionKind) {
-            if (typeof PermissionKind[kind] === 'number') {
-                result.push(kind);
-            }
-        }
-        return result;
+    get schema() {
+        return options;
     }
-    constructor() {
-        super();
-        _SpoCustomActionSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCustomActionSetCommand_instances, "m", _SpoCustomActionSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCustomActionSetCommand_instances, "m", _SpoCustomActionSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCustomActionSetCommand_instances, "m", _SpoCustomActionSetCommand_initValidators).call(this);
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => opts.title || opts.name || opts.location ||
+            opts.actionUrl || opts.clientSideComponentId || opts.clientSideComponentProperties ||
+            opts.commandUIExtension || opts.group || opts.imageUrl ||
+            opts.description || opts.registrationId || opts.registrationType ||
+            opts.rights || opts.scriptBlock || opts.scriptSrc ||
+            opts.sequence !== undefined, {
+            message: 'Please specify option to be updated'
+        })
+            .refine(opts => !(opts.scriptSrc && opts.scriptBlock), {
+            message: 'Either option scriptSrc or scriptBlock can be specified, but not both'
+        });
+    }
+    get permissionsKindMap() {
+        return permissionKinds;
     }
     async commandAction(logger, args) {
         try {
@@ -104,7 +154,7 @@ class SpoCustomActionSetCommand extends SpoCommand {
         if (options.description) {
             requestBody.Description = options.description;
         }
-        if (options.sequence) {
+        if (options.sequence !== undefined) {
             requestBody.Sequence = options.sequence;
         }
         if (options.registrationType) {
@@ -162,112 +212,5 @@ class SpoCustomActionSetCommand extends SpoCommand {
         return 0; // None
     }
 }
-_SpoCustomActionSetCommand_instances = new WeakSet(), _SpoCustomActionSetCommand_initTelemetry = function _SpoCustomActionSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            location: args.options.location,
-            scope: args.options.scope || 'Web',
-            group: (!(!args.options.group)).toString(),
-            description: (!(!args.options.description)).toString(),
-            sequence: (!(!args.options.sequence)).toString(),
-            actionUrl: (!(!args.options.actionUrl)).toString(),
-            imageUrl: (!(!args.options.imageUrl)).toString(),
-            commandUIExtension: (!(!args.options.commandUIExtension)).toString(),
-            registrationId: args.options.registrationId,
-            registrationType: args.options.registrationType,
-            rights: args.options.rights,
-            scriptSrc: (!(!args.options.scriptSrc)).toString(),
-            scriptBlock: (!(!args.options.scriptBlock)).toString(),
-            clientSideComponentId: (!(!args.options.clientSideComponentId)).toString(),
-            clientSideComponentProperties: (!(!args.options.clientSideComponentProperties)).toString()
-        });
-    });
-}, _SpoCustomActionSetCommand_initOptions = function _SpoCustomActionSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-i, --id <id>'
-    }, {
-        option: '-n, --name [name]'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '-l, --location [location]'
-    }, {
-        option: '-g, --group [group]'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '--sequence [sequence]'
-    }, {
-        option: '--actionUrl [actionUrl]'
-    }, {
-        option: '--imageUrl [imageUrl]'
-    }, {
-        option: '-e, --commandUIExtension [commandUIExtension]'
-    }, {
-        option: '--registrationId [registrationId]'
-    }, {
-        option: '--registrationType [registrationType]',
-        autocomplete: ['None', 'List', 'ContentType', 'ProgId', 'FileType']
-    }, {
-        option: '--rights [rights]',
-        autocomplete: this.permissionsKindMap
-    }, {
-        option: '-s, --scope [scope]',
-        autocomplete: ['Site', 'Web', 'All']
-    }, {
-        option: '--scriptBlock [scriptBlock]'
-    }, {
-        option: '--scriptSrc [scriptSrc]'
-    }, {
-        option: '-c, --clientSideComponentId [clientSideComponentId]'
-    }, {
-        option: '-p, --clientSideComponentProperties [clientSideComponentProperties]'
-    });
-}, _SpoCustomActionSetCommand_initValidators = function _SpoCustomActionSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (validation.isValidGuid(args.options.id) === false) {
-            return `${args.options.id} is not valid. Custom action id (Guid) expected`;
-        }
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (!args.options.title && !args.options.name && !args.options.location &&
-            !args.options.actionUrl && !args.options.clientSideComponentId && !args.options.clientSideComponentProperties &&
-            !args.options.commandUIExtension && !args.options.group && !args.options.imageUrl &&
-            !args.options.description && !args.options.registrationId && !args.options.registrationType &&
-            !args.options.rights && !args.options.scriptBlock && !args.options.scriptSrc &&
-            !args.options.sequence) {
-            return 'Please specify option to be updated';
-        }
-        if (args.options.scriptSrc && args.options.scriptBlock) {
-            return 'Either option scriptSrc or scriptBlock can be specified, but not both';
-        }
-        if (args.options.sequence && (args.options.sequence < 0 || args.options.sequence > 65536)) {
-            return 'Invalid option sequence. Expected value in range from 0 to 65536';
-        }
-        if (args.options.clientSideComponentId && validation.isValidGuid(args.options.clientSideComponentId) === false) {
-            return `ClientSideComponentId ${args.options.clientSideComponentId} is not a valid GUID`;
-        }
-        if (args.options.scope &&
-            args.options.scope !== 'Site' &&
-            args.options.scope !== 'Web' &&
-            args.options.scope !== 'All') {
-            return `${args.options.scope} is not a valid custom action scope. Allowed values are Site|Web|All`;
-        }
-        if (args.options.rights) {
-            const rights = args.options.rights.split(',');
-            for (const item of rights) {
-                const kind = PermissionKind[item.trim()];
-                if (!kind) {
-                    return `Rights option '${item}' is not recognized as valid PermissionKind choice. Please note it is case-sensitive`;
-                }
-            }
-        }
-        return true;
-    });
-};
 export default new SpoCustomActionSetCommand();
 //# sourceMappingURL=customaction-set.js.map

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

@@ -57,20 +57,11 @@ class SpoExternalUserListCommand extends SpoCommand {
             }
             else {
                 const results = json.pop();
-                if (results.TotalUserCount > 0) {
-                    await logger.log(results.ExternalUserCollection._Child_Items_.map(e => {
-                        delete e._ObjectType_;
-                        const dateChunks = e.WhenCreated
-                            .replace('/Date(', '')
-                            .replace(')/', '')
-                            .split(',')
-                            .map(c => {
-                            return parseInt(c);
-                        });
-                        e.WhenCreated = new Date(dateChunks[0], dateChunks[1], dateChunks[2], dateChunks[3], dateChunks[4], dateChunks[5], dateChunks[6]);
-                        return e;
-                    }));
-                }
+                await logger.log(results.ExternalUserCollection._Child_Items_.map(e => {
+                    delete e._ObjectType_;
+                    e.WhenCreated = formatting.extractCsomDate(e.WhenCreated);
+                    return e;
+                }));
             }
         }
         catch (err) {

package/dist/m365/spo/commands/knowledgehub/knowledgehub-get.js

@@ -1,8 +1,10 @@
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = globalOptionsZod.strict();
 class SpoKnowledgehubGetCommand extends SpoCommand {
     get name() {
         return commands.KNOWLEDGEHUB_GET;
@@ -10,6 +12,9 @@ class SpoKnowledgehubGetCommand extends SpoCommand {
     get description() {
         return 'Gets the Knowledge Hub Site URL for your tenant';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         try {
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);

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

@@ -1,15 +1,15 @@
-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 _SpoKnowledgehubRemoveCommand_instances, _SpoKnowledgehubRemoveCommand_initTelemetry, _SpoKnowledgehubRemoveCommand_initOptions;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    force: z.boolean().optional().alias('f')
+});
 class SpoKnowledgehubRemoveCommand extends SpoCommand {
     get name() {
         return commands.KNOWLEDGEHUB_REMOVE;
@@ -17,11 +17,8 @@ class SpoKnowledgehubRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes the Knowledge Hub Site setting for your tenant';
     }
-    constructor() {
-        super();
-        _SpoKnowledgehubRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoKnowledgehubRemoveCommand_instances, "m", _SpoKnowledgehubRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoKnowledgehubRemoveCommand_instances, "m", _SpoKnowledgehubRemoveCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const removeKnowledgehub = async () => {
@@ -64,16 +61,5 @@ class SpoKnowledgehubRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoKnowledgehubRemoveCommand_instances = new WeakSet(), _SpoKnowledgehubRemoveCommand_initTelemetry = function _SpoKnowledgehubRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _SpoKnowledgehubRemoveCommand_initOptions = function _SpoKnowledgehubRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-f, --force'
-    });
-};
 export default new SpoKnowledgehubRemoveCommand();
 //# sourceMappingURL=knowledgehub-remove.js.map

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

@@ -1,9 +1,5 @@
-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 _SpoKnowledgehubSetCommand_instances, _SpoKnowledgehubSetCommand_initOptions, _SpoKnowledgehubSetCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -11,6 +7,12 @@ import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    siteUrl: z.string().refine(url => validation.isValidSharePointUrl(url) === true, {
+        message: 'The value of the option \'siteUrl\' is not a valid SharePoint Online site URL.'
+    }).alias('u')
+});
 class SpoKnowledgehubSetCommand extends SpoCommand {
     get name() {
         return commands.KNOWLEDGEHUB_SET;
@@ -18,11 +20,8 @@ class SpoKnowledgehubSetCommand extends SpoCommand {
     get description() {
         return 'Sets the Knowledge Hub Site for your tenant';
     }
-    constructor() {
-        super();
-        _SpoKnowledgehubSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoKnowledgehubSetCommand_instances, "m", _SpoKnowledgehubSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoKnowledgehubSetCommand_instances, "m", _SpoKnowledgehubSetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -51,12 +50,5 @@ class SpoKnowledgehubSetCommand extends SpoCommand {
         }
     }
 }
-_SpoKnowledgehubSetCommand_instances = new WeakSet(), _SpoKnowledgehubSetCommand_initOptions = function _SpoKnowledgehubSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --siteUrl <siteUrl>'
-    });
-}, _SpoKnowledgehubSetCommand_initValidators = function _SpoKnowledgehubSetCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.siteUrl));
-};
 export default new SpoKnowledgehubSetCommand();
 //# sourceMappingURL=knowledgehub-set.js.map

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

@@ -1,10 +1,6 @@
-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 _SpoListItemAddCommand_instances, _SpoListItemAddCommand_initTelemetry, _SpoListItemAddCommand_initOptions, _SpoListItemAddCommand_initValidators, _SpoListItemAddCommand_initTypes, _SpoListItemAddCommand_initOptionSets;
 import os from 'os';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { basic } from '../../../../utils/basic.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -13,6 +9,19 @@ import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.object({
+    ...globalOptionsZod.shape,
+    webUrl: z.string().refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    listId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} in option listId is not a valid GUID`
+    }).optional().alias('l'),
+    listTitle: z.string().optional().alias('t'),
+    listUrl: z.string().optional(),
+    contentType: z.string().optional().alias('c'),
+    folder: z.string().optional()
+}).catchall(z.unknown());
 class SpoListItemAddCommand extends SpoCommand {
     allowUnknownOptions() {
         return true;
@@ -23,14 +32,18 @@ class SpoListItemAddCommand extends SpoCommand {
     get description() {
         return 'Creates a list item in the specified list';
     }
-    constructor() {
-        super();
-        _SpoListItemAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoListItemAddCommand_instances, "m", _SpoListItemAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoListItemAddCommand_instances, "m", _SpoListItemAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoListItemAddCommand_instances, "m", _SpoListItemAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoListItemAddCommand_instances, "m", _SpoListItemAddCommand_initTypes).call(this);
-        __classPrivateFieldGet(this, _SpoListItemAddCommand_instances, "m", _SpoListItemAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.listId, opts.listTitle, opts.listUrl].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: listId, listTitle, listUrl.',
+            params: {
+                customCode: 'optionSet',
+                options: ['listId', 'listTitle', 'listUrl']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -177,46 +190,5 @@ class SpoListItemAddCommand extends SpoCommand {
         return requestBody;
     }
 }
-_SpoListItemAddCommand_instances = new WeakSet(), _SpoListItemAddCommand_initTelemetry = function _SpoListItemAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        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',
-            folder: typeof args.options.folder !== 'undefined'
-        });
-    });
-}, _SpoListItemAddCommand_initOptions = function _SpoListItemAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-l, --listId [listId]'
-    }, {
-        option: '-t, --listTitle [listTitle]'
-    }, {
-        option: '--listUrl [listUrl]'
-    }, {
-        option: '-c, --contentType [contentType]'
-    }, {
-        option: '--folder [folder]'
-    });
-}, _SpoListItemAddCommand_initValidators = function _SpoListItemAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.listId &&
-            !validation.isValidGuid(args.options.listId)) {
-            return `${args.options.listId} in option listId is not a valid GUID`;
-        }
-        return true;
-    });
-}, _SpoListItemAddCommand_initTypes = function _SpoListItemAddCommand_initTypes() {
-    this.types.string.push('webUrl', 'listId', 'listTitle', 'listUrl', 'contentType', 'folder');
-}, _SpoListItemAddCommand_initOptionSets = function _SpoListItemAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
-};
 export default new SpoListItemAddCommand();
 //# sourceMappingURL=listitem-add.js.map

package/dist/m365/spo/commands/listitem/listitem-attachment-add.js

@@ -1,9 +1,5 @@
-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 _SpoListItemAttachmentAddCommand_instances, _SpoListItemAttachmentAddCommand_initTelemetry, _SpoListItemAttachmentAddCommand_initOptions, _SpoListItemAttachmentAddCommand_initValidators, _SpoListItemAttachmentAddCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
@@ -11,6 +7,22 @@ import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import fs from 'fs';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string().refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    listId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} in option listId is not a valid GUID.`
+    }).optional(),
+    listTitle: z.string().optional(),
+    listUrl: z.string().optional(),
+    listItemId: z.number().int().positive(),
+    filePath: z.string().refine(path => fs.existsSync(path), {
+        error: e => `File with path '${e.input}' was not found.`
+    }).alias('p'),
+    fileName: z.string().optional().alias('n')
+});
 class SpoListItemAttachmentAddCommand extends SpoCommand {
     get name() {
         return commands.LISTITEM_ATTACHMENT_ADD;
@@ -18,13 +30,18 @@ class SpoListItemAttachmentAddCommand extends SpoCommand {
     get description() {
         return 'Adds an attachment to a list item';
     }
-    constructor() {
-        super();
-        _SpoListItemAttachmentAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoListItemAttachmentAddCommand_instances, "m", _SpoListItemAttachmentAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoListItemAttachmentAddCommand_instances, "m", _SpoListItemAttachmentAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoListItemAttachmentAddCommand_instances, "m", _SpoListItemAttachmentAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoListItemAttachmentAddCommand_instances, "m", _SpoListItemAttachmentAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.listId, opts.listTitle, opts.listUrl].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: listId, listTitle, listUrl.',
+            params: {
+                customCode: 'optionSet',
+                options: ['listId', 'listTitle', 'listUrl']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -78,50 +95,5 @@ class SpoListItemAttachmentAddCommand extends SpoCommand {
         }
     }
 }
-_SpoListItemAttachmentAddCommand_instances = new WeakSet(), _SpoListItemAttachmentAddCommand_initTelemetry = function _SpoListItemAttachmentAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            listId: typeof args.options.listId !== 'undefined',
-            listTitle: typeof args.options.listTitle !== 'undefined',
-            listUrl: typeof args.options.listUrl !== 'undefined',
-            fileName: typeof args.options.fileName !== 'undefined'
-        });
-    });
-}, _SpoListItemAttachmentAddCommand_initOptions = function _SpoListItemAttachmentAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--listId [listId]'
-    }, {
-        option: '--listTitle [listTitle]'
-    }, {
-        option: '--listUrl [listUrl]'
-    }, {
-        option: '--listItemId <listItemId>'
-    }, {
-        option: '-p, --filePath <filePath>'
-    }, {
-        option: '-n, --fileName [fileName]'
-    });
-}, _SpoListItemAttachmentAddCommand_initValidators = function _SpoListItemAttachmentAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (isNaN(args.options.listItemId)) {
-            return `${args.options.listItemId} in option listItemId is not a valid number.`;
-        }
-        if (args.options.listId && !validation.isValidGuid(args.options.listId)) {
-            return `${args.options.listId} in option listId is not a valid GUID.`;
-        }
-        if (!fs.existsSync(args.options.filePath)) {
-            return `File with path '${args.options.filePath}' was not found.`;
-        }
-        return true;
-    });
-}, _SpoListItemAttachmentAddCommand_initOptionSets = function _SpoListItemAttachmentAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
-};
 export default new SpoListItemAttachmentAddCommand();
 //# sourceMappingURL=listitem-attachment-add.js.map