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

package/dist/m365/spo/commands/contenttype/contenttype-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 _SpoContentTypeAddCommand_instances, _SpoContentTypeAddCommand_initTelemetry, _SpoContentTypeAddCommand_initOptions, _SpoContentTypeAddCommand_initValidators, _SpoContentTypeAddCommand_initTypes;
+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 { formatting } from '../../../../utils/formatting.js';
@@ -13,6 +9,24 @@ import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import spoContentTypeGetCommand from './contenttype-get.js';
+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'),
+    listTitle: z.string().optional().alias('l'),
+    listId: z.string()
+        .refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} is not a valid GUID`
+    }).optional(),
+    listUrl: z.string().optional(),
+    id: z.string().alias('i'),
+    name: z.string().alias('n'),
+    description: z.string().optional().alias('d'),
+    group: z.string().optional().alias('g')
+});
 class SpoContentTypeAddCommand extends SpoCommand {
     get name() {
         return commands.CONTENTTYPE_ADD;
@@ -20,13 +34,8 @@ class SpoContentTypeAddCommand extends SpoCommand {
     get description() {
         return 'Adds a new list or site content type';
     }
-    constructor() {
-        super();
-        _SpoContentTypeAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoContentTypeAddCommand_instances, "m", _SpoContentTypeAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoContentTypeAddCommand_instances, "m", _SpoContentTypeAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoContentTypeAddCommand_instances, "m", _SpoContentTypeAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoContentTypeAddCommand_instances, "m", _SpoContentTypeAddCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -92,43 +101,5 @@ class SpoContentTypeAddCommand extends SpoCommand {
         return `<Identity Id="5" Name="1a48869e-c092-0000-1f61-81ec89809537|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}:list:${listId}" />`;
     }
 }
-_SpoContentTypeAddCommand_instances = new WeakSet(), _SpoContentTypeAddCommand_initTelemetry = function _SpoContentTypeAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            listTitle: typeof args.options.listTitle !== 'undefined',
-            description: typeof args.options.description !== 'undefined',
-            group: typeof args.options.group !== 'undefined'
-        });
-    });
-}, _SpoContentTypeAddCommand_initOptions = function _SpoContentTypeAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-l, --listTitle [listTitle]'
-    }, {
-        option: '--listId [listId]'
-    }, {
-        option: '--listUrl [listUrl]'
-    }, {
-        option: '-i, --id <id>'
-    }, {
-        option: '-n, --name <name>'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '-g, --group [group]'
-    });
-}, _SpoContentTypeAddCommand_initValidators = function _SpoContentTypeAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.listId) {
-            if (!validation.isValidGuid(args.options.listId)) {
-                return `${args.options.listId} is not a valid GUID`;
-            }
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-}, _SpoContentTypeAddCommand_initTypes = function _SpoContentTypeAddCommand_initTypes() {
-    this.types.string.push('id', 'i');
-};
 export default new SpoContentTypeAddCommand();
 //# sourceMappingURL=contenttype-add.js.map

package/dist/m365/spo/commands/contenttype/contenttype-field-list.js

@@ -1,15 +1,28 @@
-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 _SpoContentTypeFieldListCommand_instances, _SpoContentTypeFieldListCommand_initTelemetry, _SpoContentTypeFieldListCommand_initOptions, _SpoContentTypeFieldListCommand_initValidators, _SpoContentTypeFieldListCommand_initTypes, _SpoContentTypeFieldListCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 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.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'),
+    contentTypeId: z.string().optional().alias('i'),
+    contentTypeName: z.string().optional().alias('n'),
+    listTitle: z.string().optional().alias('l'),
+    listId: z.string()
+        .refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} is not a valid GUID for option 'listId'.`
+    }).optional(),
+    listUrl: z.string().optional(),
+    properties: z.string().optional().alias('p')
+});
 class SpoContentTypeFieldListCommand extends SpoCommand {
     get name() {
         return commands.CONTENTTYPE_FIELD_LIST;
@@ -20,14 +33,25 @@ class SpoContentTypeFieldListCommand extends SpoCommand {
     defaultProperties() {
         return ['Id', 'Title', 'InternalName', 'Hidden'];
     }
-    constructor() {
-        super();
-        _SpoContentTypeFieldListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoContentTypeFieldListCommand_instances, "m", _SpoContentTypeFieldListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoContentTypeFieldListCommand_instances, "m", _SpoContentTypeFieldListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoContentTypeFieldListCommand_instances, "m", _SpoContentTypeFieldListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoContentTypeFieldListCommand_instances, "m", _SpoContentTypeFieldListCommand_initTypes).call(this);
-        __classPrivateFieldGet(this, _SpoContentTypeFieldListCommand_instances, "m", _SpoContentTypeFieldListCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.contentTypeId, opts.contentTypeName].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'contentTypeId' or 'contentTypeName', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['contentTypeId', 'contentTypeName']
+            }
+        })
+            .refine(opts => [opts.listId, opts.listTitle, opts.listUrl].filter(x => x !== undefined).length <= 1, {
+            error: `Specify either 'listId', 'listTitle' or 'listUrl'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['listId', 'listTitle', 'listUrl']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -72,53 +96,5 @@ class SpoContentTypeFieldListCommand extends SpoCommand {
         return res[0].StringId;
     }
 }
-_SpoContentTypeFieldListCommand_instances = new WeakSet(), _SpoContentTypeFieldListCommand_initTelemetry = function _SpoContentTypeFieldListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            contentTypeId: typeof args.options.contentTypeId !== 'undefined',
-            contentTypeName: typeof args.options.contentTypeName !== 'undefined',
-            listId: typeof args.options.listId !== 'undefined',
-            listTitle: typeof args.options.listTitle !== 'undefined',
-            listUrl: typeof args.options.listUrl !== 'undefined',
-            properties: typeof args.options.properties !== 'undefined'
-        });
-    });
-}, _SpoContentTypeFieldListCommand_initOptions = function _SpoContentTypeFieldListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-i, --contentTypeId [contentTypeId]'
-    }, {
-        option: '-n, --contentTypeName [contentTypeName]'
-    }, {
-        option: '-l, --listTitle [listTitle]'
-    }, {
-        option: '--listId [listId]'
-    }, {
-        option: '--listUrl [listUrl]'
-    }, {
-        option: '-p, --properties [properties]'
-    });
-}, _SpoContentTypeFieldListCommand_initValidators = function _SpoContentTypeFieldListCommand_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} is not a valid GUID for option 'listId'.`;
-        }
-        return true;
-    });
-}, _SpoContentTypeFieldListCommand_initTypes = function _SpoContentTypeFieldListCommand_initTypes() {
-    this.types.string.push('webUrl', 'contentTypeId', 'contentTypeName', 'listTitle', 'listId', 'listUrl', 'properties');
-}, _SpoContentTypeFieldListCommand_initOptionSets = function _SpoContentTypeFieldListCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['contentTypeId', 'contentTypeName']
-    }, {
-        options: ['listId', 'listTitle', 'listUrl'],
-        runsWhen: (args) => args.options.listId || args.options.listTitle || args.options.listUrl
-    });
-};
 export default new SpoContentTypeFieldListCommand();
 //# sourceMappingURL=contenttype-field-list.js.map

package/dist/m365/spo/commands/contenttype/contenttype-field-remove.js

@@ -1,16 +1,33 @@
-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 _SpoContentTypeFieldRemoveCommand_instances, _SpoContentTypeFieldRemoveCommand_initTelemetry, _SpoContentTypeFieldRemoveCommand_initOptions, _SpoContentTypeFieldRemoveCommand_initValidators, _SpoContentTypeFieldRemoveCommand_initTypes;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 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,
+    contentTypeId: z.string(),
+    id: z.string()
+        .refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} is not a valid GUID`
+    }).alias('i'),
+    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} is not a valid GUID`
+    }).optional(),
+    listTitle: z.string().optional().alias('l'),
+    listUrl: z.string().optional(),
+    updateChildContentTypes: z.boolean().optional().alias('c'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoContentTypeFieldRemoveCommand extends SpoCommand {
     get name() {
         return commands.CONTENTTYPE_FIELD_REMOVE;
@@ -18,13 +35,8 @@ class SpoContentTypeFieldRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes a column from a site- or list content type';
     }
-    constructor() {
-        super();
-        _SpoContentTypeFieldRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoContentTypeFieldRemoveCommand_instances, "m", _SpoContentTypeFieldRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoContentTypeFieldRemoveCommand_instances, "m", _SpoContentTypeFieldRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoContentTypeFieldRemoveCommand_instances, "m", _SpoContentTypeFieldRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoContentTypeFieldRemoveCommand_instances, "m", _SpoContentTypeFieldRemoveCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const removeFieldLink = async () => {
@@ -95,46 +107,5 @@ class SpoContentTypeFieldRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoContentTypeFieldRemoveCommand_instances = new WeakSet(), _SpoContentTypeFieldRemoveCommand_initTelemetry = function _SpoContentTypeFieldRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            listTitle: typeof args.options.listTitle !== 'undefined',
-            listId: typeof args.options.listId !== 'undefined',
-            listUrl: typeof args.options.listUrl !== 'undefined',
-            updateChildContentTypes: !!args.options.updateChildContentTypes,
-            force: !!args.options.force
-        });
-    });
-}, _SpoContentTypeFieldRemoveCommand_initOptions = function _SpoContentTypeFieldRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-l, --listTitle [listTitle]'
-    }, {
-        option: '--listId [listId]'
-    }, {
-        option: '--listUrl [listUrl]'
-    }, {
-        option: '--contentTypeId <contentTypeId>'
-    }, {
-        option: '-i, --id <id>'
-    }, {
-        option: '-c, --updateChildContentTypes'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoContentTypeFieldRemoveCommand_initValidators = function _SpoContentTypeFieldRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (args.options.listId && !validation.isValidGuid(args.options.listId)) {
-            return `${args.options.listId} is not a valid GUID`;
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-}, _SpoContentTypeFieldRemoveCommand_initTypes = function _SpoContentTypeFieldRemoveCommand_initTypes() {
-    this.types.string.push('i', 'contentTypeId');
-};
 export default new SpoContentTypeFieldRemoveCommand();
 //# sourceMappingURL=contenttype-field-remove.js.map

package/dist/m365/spo/commands/contenttype/contenttype-field-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 _SpoContentTypeFieldSetCommand_instances, _SpoContentTypeFieldSetCommand_initTelemetry, _SpoContentTypeFieldSetCommand_initOptions, _SpoContentTypeFieldSetCommand_initValidators, _SpoContentTypeFieldSetCommand_initTypes;
+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,21 @@ 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,
+    contentTypeId: z.string(),
+    id: z.string()
+        .refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} is not a valid GUID`
+    }).alias('i'),
+    hidden: z.boolean().optional(),
+    required: z.boolean().optional().alias('r'),
+    webUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u')
+});
 class SpoContentTypeFieldSetCommand extends SpoCommand {
     get name() {
         return commands.CONTENTTYPE_FIELD_SET;
@@ -18,13 +29,11 @@ class SpoContentTypeFieldSetCommand extends SpoCommand {
     get description() {
         return 'Adds or updates a site column reference in a site content type';
     }
+    get schema() {
+        return options;
+    }
     constructor() {
         super();
-        _SpoContentTypeFieldSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoContentTypeFieldSetCommand_instances, "m", _SpoContentTypeFieldSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoContentTypeFieldSetCommand_instances, "m", _SpoContentTypeFieldSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoContentTypeFieldSetCommand_instances, "m", _SpoContentTypeFieldSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoContentTypeFieldSetCommand_instances, "m", _SpoContentTypeFieldSetCommand_initTypes).call(this);
         this.requestDigest = '';
         this.siteId = '';
         this.webId = '';
@@ -207,37 +216,5 @@ class SpoContentTypeFieldSetCommand extends SpoCommand {
         this.requestDigest = res.FormDigestValue;
     }
 }
-_SpoContentTypeFieldSetCommand_instances = new WeakSet(), _SpoContentTypeFieldSetCommand_initTelemetry = function _SpoContentTypeFieldSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            hidden: args.options.hidden,
-            required: args.options.required
-        });
-    });
-}, _SpoContentTypeFieldSetCommand_initOptions = function _SpoContentTypeFieldSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--contentTypeId <contentTypeId>'
-    }, {
-        option: '-i, --id <id>'
-    }, {
-        option: '-r, --required [required]',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '--hidden [hidden]',
-        autocomplete: ['true', 'false']
-    });
-}, _SpoContentTypeFieldSetCommand_initValidators = function _SpoContentTypeFieldSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-}, _SpoContentTypeFieldSetCommand_initTypes = function _SpoContentTypeFieldSetCommand_initTypes() {
-    this.types.string.push('contentTypeId', 'c');
-    this.types.boolean.push('required', 'hidden');
-};
 export default new SpoContentTypeFieldSetCommand();
 //# sourceMappingURL=contenttype-field-set.js.map

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

@@ -1,15 +1,27 @@
-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 _SpoContentTypeGetCommand_instances, _SpoContentTypeGetCommand_initTelemetry, _SpoContentTypeGetCommand_initOptions, _SpoContentTypeGetCommand_initValidators, _SpoContentTypeGetCommand_initTypes, _SpoContentTypeGetCommand_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';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+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'),
+    listTitle: z.string().optional().alias('l'),
+    listId: z.string()
+        .refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} is not a valid GUID`
+    }).optional(),
+    listUrl: z.string().optional(),
+    id: z.string().optional().alias('i'),
+    name: z.string().optional().alias('n')
+});
 class SpoContentTypeGetCommand extends SpoCommand {
     get name() {
         return commands.CONTENTTYPE_GET;
@@ -17,14 +29,17 @@ class SpoContentTypeGetCommand extends SpoCommand {
     get description() {
         return 'Retrieves information about the specified list or site content type';
     }
-    constructor() {
-        super();
-        _SpoContentTypeGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoContentTypeGetCommand_instances, "m", _SpoContentTypeGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoContentTypeGetCommand_instances, "m", _SpoContentTypeGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoContentTypeGetCommand_instances, "m", _SpoContentTypeGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoContentTypeGetCommand_instances, "m", _SpoContentTypeGetCommand_initTypes).call(this);
-        __classPrivateFieldGet(this, _SpoContentTypeGetCommand_instances, "m", _SpoContentTypeGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema.refine(opts => [opts.id, opts.name].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'id' or 'name', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        });
     }
     async commandAction(logger, args) {
         let requestUrl = `${args.options.webUrl}/_api/web`;
@@ -76,45 +91,5 @@ class SpoContentTypeGetCommand extends SpoCommand {
         }
     }
 }
-_SpoContentTypeGetCommand_instances = new WeakSet(), _SpoContentTypeGetCommand_initTelemetry = function _SpoContentTypeGetCommand_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',
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined'
-        });
-    });
-}, _SpoContentTypeGetCommand_initOptions = function _SpoContentTypeGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-l, --listTitle [listTitle]'
-    }, {
-        option: '--listId [listId]'
-    }, {
-        option: '--listUrl [listUrl]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    });
-}, _SpoContentTypeGetCommand_initValidators = function _SpoContentTypeGetCommand_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} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _SpoContentTypeGetCommand_initTypes = function _SpoContentTypeGetCommand_initTypes() {
-    this.types.string.push('id', 'i');
-}, _SpoContentTypeGetCommand_initOptionSets = function _SpoContentTypeGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-};
 export default new SpoContentTypeGetCommand();
 //# sourceMappingURL=contenttype-get.js.map

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

@@ -1,14 +1,19 @@
-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 _SpoContentTypeListCommand_instances, _SpoContentTypeListCommand_initTelemetry, _SpoContentTypeListCommand_initOptions, _SpoContentTypeListCommand_initValidators, _SpoContentTypeListCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.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,
+    webUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u'),
+    category: z.string().optional().alias('c')
+});
 class SpoContentTypeListCommand extends SpoCommand {
     get name() {
         return commands.CONTENTTYPE_LIST;
@@ -19,13 +24,8 @@ class SpoContentTypeListCommand extends SpoCommand {
     defaultProperties() {
         return ['StringId', 'Name', 'Hidden', 'ReadOnly', 'Sealed'];
     }
-    constructor() {
-        super();
-        _SpoContentTypeListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoContentTypeListCommand_instances, "m", _SpoContentTypeListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoContentTypeListCommand_instances, "m", _SpoContentTypeListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoContentTypeListCommand_instances, "m", _SpoContentTypeListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoContentTypeListCommand_instances, "m", _SpoContentTypeListCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -41,22 +41,5 @@ class SpoContentTypeListCommand extends SpoCommand {
         }
     }
 }
-_SpoContentTypeListCommand_instances = new WeakSet(), _SpoContentTypeListCommand_initTelemetry = function _SpoContentTypeListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            category: typeof args.options.category !== 'undefined'
-        });
-    });
-}, _SpoContentTypeListCommand_initOptions = function _SpoContentTypeListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-c, --category [category]'
-    });
-}, _SpoContentTypeListCommand_initValidators = function _SpoContentTypeListCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
-}, _SpoContentTypeListCommand_initTypes = function _SpoContentTypeListCommand_initTypes() {
-    this.types.string.push('webUrl', 'category');
-};
 export default new SpoContentTypeListCommand();
 //# sourceMappingURL=contenttype-list.js.map