@pnp/cli-microsoft365 12.0.0-beta.0be7d8d → 12.0.0-beta.1752794

package/dist/m365/spo/commands/field/field-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 _SpoFieldAddCommand_instances, _SpoFieldAddCommand_initTelemetry, _SpoFieldAddCommand_initOptions, _SpoFieldAddCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
@@ -11,6 +7,29 @@ import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+const fieldOptions = ['DefaultValue', 'AddToDefaultContentType', 'AddToNoContentType', 'AddToAllContentTypes', 'AddFieldInternalNameHint', 'AddFieldToDefaultView', 'AddFieldCheckDisplayName'];
+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} in option listId is not a valid GUID`
+    }).optional(),
+    listUrl: z.string().optional(),
+    xml: z.string().alias('x'),
+    options: z.string().refine(val => {
+        const items = val.split(',').map(o => o.trim());
+        return items.every(item => fieldOptions.indexOf(item) !== -1);
+    }, {
+        error: e => {
+            const items = e.input.split(',').map((o) => o.trim());
+            const invalid = items.find((item) => fieldOptions.indexOf(item) === -1);
+            return `${invalid} is not a valid value for the options argument. Allowed values are ${fieldOptions.join('|')}`;
+        }
+    }).optional()
+});
 class SpoFieldAddCommand extends SpoCommand {
     get name() {
         return commands.FIELD_ADD;
@@ -18,12 +37,14 @@ class SpoFieldAddCommand extends SpoCommand {
     get description() {
         return 'Adds a new list or site column using the CAML field definition';
     }
-    constructor() {
-        super();
-        _SpoFieldAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFieldAddCommand_instances, "m", _SpoFieldAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFieldAddCommand_instances, "m", _SpoFieldAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFieldAddCommand_instances, "m", _SpoFieldAddCommand_initValidators).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: 'Specify either list id or title or list url, but not multiple'
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -94,55 +115,5 @@ class SpoFieldAddCommand extends SpoCommand {
         return optionsValue;
     }
 }
-_SpoFieldAddCommand_instances = new WeakSet(), _SpoFieldAddCommand_initTelemetry = function _SpoFieldAddCommand_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',
-            options: typeof args.options.options !== 'undefined'
-        });
-    });
-}, _SpoFieldAddCommand_initOptions = function _SpoFieldAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-l, --listTitle [listTitle]'
-    }, {
-        option: '--listId [listId]'
-    }, {
-        option: '--listUrl [listUrl]'
-    }, {
-        option: '-x, --xml <xml>'
-    }, {
-        option: '--options [options]'
-    });
-}, _SpoFieldAddCommand_initValidators = function _SpoFieldAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        const listOptions = [args.options.listId, args.options.listTitle, args.options.listUrl];
-        if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either list id or title or list url, but not multiple`;
-        }
-        if (args.options.listId && !validation.isValidGuid(args.options.listId)) {
-            return `${args.options.listId} in option listId is not a valid GUID`;
-        }
-        if (args.options.options) {
-            let optionsError = true;
-            const options = ['DefaultValue', 'AddToDefaultContentType', 'AddToNoContentType', 'AddToAllContentTypes', 'AddFieldInternalNameHint', 'AddFieldToDefaultView', 'AddFieldCheckDisplayName'];
-            args.options.options.split(',').forEach(o => {
-                o = o.trim();
-                if (options.indexOf(o) < 0) {
-                    optionsError = `${o} is not a valid value for the options argument. Allowed values are DefaultValue|AddToDefaultContentType|AddToNoContentType|AddToAllContentTypes|AddFieldInternalNameHint|AddFieldToDefaultView|AddFieldCheckDisplayName`;
-                }
-            });
-            return optionsError;
-        }
-        return true;
-    });
-};
 export default new SpoFieldAddCommand();
 //# sourceMappingURL=field-add.js.map

package/dist/m365/spo/commands/field/field-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 _SpoFieldGetCommand_instances, _SpoFieldGetCommand_initTelemetry, _SpoFieldGetCommand_initOptions, _SpoFieldGetCommand_initValidators, _SpoFieldGetCommand_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().refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} is not a valid GUID`
+    }).optional().alias('i'),
+    title: z.string().optional().alias('t'),
+    internalName: z.string().optional()
+});
 class SpoFieldGetCommand extends SpoCommand {
     get name() {
         return commands.FIELD_GET;
@@ -17,13 +29,18 @@ class SpoFieldGetCommand extends SpoCommand {
     get description() {
         return 'Retrieves information about the specified list- or site column';
     }
-    constructor() {
-        super();
-        _SpoFieldGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFieldGetCommand_instances, "m", _SpoFieldGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFieldGetCommand_instances, "m", _SpoFieldGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFieldGetCommand_instances, "m", _SpoFieldGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFieldGetCommand_instances, "m", _SpoFieldGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.title, opts.internalName].filter(o => o !== undefined).length === 1, {
+            error: 'Specify one of the following options: id, title, internalName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'title', 'internalName']
+            }
+        });
     }
     async commandAction(logger, args) {
         let listRestUrl = '';
@@ -60,49 +77,5 @@ class SpoFieldGetCommand extends SpoCommand {
         }
     }
 }
-_SpoFieldGetCommand_instances = new WeakSet(), _SpoFieldGetCommand_initTelemetry = function _SpoFieldGetCommand_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',
-            title: typeof args.options.title !== 'undefined',
-            internalName: typeof args.options.internalName !== 'undefined'
-        });
-    });
-}, _SpoFieldGetCommand_initOptions = function _SpoFieldGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-l, --listTitle [listTitle]'
-    }, {
-        option: '--listId [listId]'
-    }, {
-        option: '--listUrl [listUrl]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '--internalName [internalName]'
-    });
-}, _SpoFieldGetCommand_initValidators = function _SpoFieldGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.id && !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 true;
-    });
-}, _SpoFieldGetCommand_initOptionSets = function _SpoFieldGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title', 'internalName'] });
-};
 export default new SpoFieldGetCommand();
 //# sourceMappingURL=field-get.js.map

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

@@ -1,15 +1,22 @@
-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 _SpoFieldListCommand_instances, _SpoFieldListCommand_initTelemetry, _SpoFieldListCommand_initOptions, _SpoFieldListCommand_initValidators;
+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'),
+    listTitle: z.string().optional().alias('t'),
+    listId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} is not a valid GUID`
+    }).optional().alias('i'),
+    listUrl: z.string().optional()
+});
 class SpoFieldListCommand extends SpoCommand {
     get name() {
         return commands.FIELD_LIST;
@@ -20,12 +27,14 @@ class SpoFieldListCommand extends SpoCommand {
     defaultProperties() {
         return ['Id', 'Title', 'InternalName', 'Hidden'];
     }
-    constructor() {
-        super();
-        _SpoFieldListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFieldListCommand_instances, "m", _SpoFieldListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFieldListCommand_instances, "m", _SpoFieldListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFieldListCommand_instances, "m", _SpoFieldListCommand_initValidators).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: 'Specify either list id or title or list url'
+        });
     }
     async commandAction(logger, args) {
         let listUrl = '';
@@ -48,39 +57,5 @@ class SpoFieldListCommand extends SpoCommand {
         }
     }
 }
-_SpoFieldListCommand_instances = new WeakSet(), _SpoFieldListCommand_initTelemetry = function _SpoFieldListCommand_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'
-        });
-    });
-}, _SpoFieldListCommand_initOptions = function _SpoFieldListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-t, --listTitle [listTitle]'
-    }, {
-        option: '-i, --listId [listId]'
-    }, {
-        option: '--listUrl [listUrl]'
-    });
-}, _SpoFieldListCommand_initValidators = function _SpoFieldListCommand_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`;
-        }
-        const listOptions = [args.options.listId, args.options.listTitle, args.options.listUrl];
-        if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either list id or title or list url`;
-        }
-        return true;
-    });
-};
 export default new SpoFieldListCommand();
 //# sourceMappingURL=field-list.js.map

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

@@ -1,16 +1,30 @@
-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 _SpoFieldRemoveCommand_instances, _SpoFieldRemoveCommand_initTelemetry, _SpoFieldRemoveCommand_initOptions, _SpoFieldRemoveCommand_initValidators, _SpoFieldRemoveCommand_initOptionSets;
+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 { 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().refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} is not a valid GUID`
+    }).optional().alias('i'),
+    title: z.string().optional().alias('t'),
+    internalName: z.string().optional(),
+    group: z.string().optional().alias('g'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoFieldRemoveCommand extends SpoCommand {
     get name() {
         return commands.FIELD_REMOVE;
@@ -18,13 +32,18 @@ class SpoFieldRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes the specified list- or site column';
     }
-    constructor() {
-        super();
-        _SpoFieldRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFieldRemoveCommand_instances, "m", _SpoFieldRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFieldRemoveCommand_instances, "m", _SpoFieldRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFieldRemoveCommand_instances, "m", _SpoFieldRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFieldRemoveCommand_instances, "m", _SpoFieldRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.title, opts.internalName, opts.group].filter(o => o !== undefined).length === 1, {
+            error: 'Specify one of the following options: id, title, internalName, group.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'title', 'internalName', 'group']
+            }
+        });
     }
     async commandAction(logger, args) {
         let messageEnd;
@@ -117,55 +136,5 @@ class SpoFieldRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoFieldRemoveCommand_instances = new WeakSet(), _SpoFieldRemoveCommand_initTelemetry = function _SpoFieldRemoveCommand_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',
-            group: typeof args.options.group !== 'undefined',
-            title: typeof args.options.title !== 'undefined',
-            internalName: typeof args.options.internalName !== 'undefined',
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _SpoFieldRemoveCommand_initOptions = function _SpoFieldRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-l, --listTitle [listTitle]'
-    }, {
-        option: '--listId [listId]'
-    }, {
-        option: '--listUrl [listUrl]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '--internalName [internalName]'
-    }, {
-        option: '-g, --group [group]'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoFieldRemoveCommand_initValidators = function _SpoFieldRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.id && !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 true;
-    });
-}, _SpoFieldRemoveCommand_initOptionSets = function _SpoFieldRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title', 'internalName', 'group'] });
-};
 export default new SpoFieldRemoveCommand();
 //# sourceMappingURL=field-remove.js.map

package/dist/m365/spo/commands/field/field-set.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 _SpoFieldSetCommand_instances, _SpoFieldSetCommand_initTelemetry, _SpoFieldSetCommand_initOptions, _SpoFieldSetCommand_initValidators, _SpoFieldSetCommand_initOptionSets;
+import { z } from 'zod';
 import config from '../../../../config.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
@@ -12,6 +8,23 @@ 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(),
+    listTitle: z.string().optional(),
+    listUrl: z.string().optional(),
+    id: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} in option id is not a valid GUID`
+    }).optional().alias('i'),
+    title: z.string().optional().alias('t'),
+    internalName: z.string().optional(),
+    updateExistingLists: z.boolean().optional()
+}).catchall(z.unknown());
 class SpoFieldSetCommand extends SpoCommand {
     get name() {
         return commands.FIELD_SET;
@@ -19,13 +32,21 @@ class SpoFieldSetCommand extends SpoCommand {
     get description() {
         return 'Updates existing list or site column';
     }
-    constructor() {
-        super();
-        _SpoFieldSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFieldSetCommand_instances, "m", _SpoFieldSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFieldSetCommand_instances, "m", _SpoFieldSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFieldSetCommand_instances, "m", _SpoFieldSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFieldSetCommand_instances, "m", _SpoFieldSetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.title, opts.internalName].filter(o => o !== undefined).length === 1, {
+            error: 'Specify one of the following options: id, title, internalName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'title', 'internalName']
+            }
+        })
+            .refine(opts => [opts.listId, opts.listTitle, opts.listUrl].filter(o => o !== undefined).length <= 1, {
+            error: 'Specify either list id or title or list url, but not multiple'
+        });
     }
     allowUnknownOptions() {
         return true;
@@ -121,58 +142,5 @@ class SpoFieldSetCommand extends SpoCommand {
         return payload;
     }
 }
-_SpoFieldSetCommand_instances = new WeakSet(), _SpoFieldSetCommand_initTelemetry = function _SpoFieldSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            title: typeof args.options.title !== 'undefined',
-            internalName: typeof args.options.internalName !== 'undefined',
-            listId: typeof args.options.listId !== 'undefined',
-            listTitle: typeof args.options.listTitle !== 'undefined',
-            listUrl: typeof args.options.listUrl !== 'undefined',
-            updateExistingLists: !!args.options.updateExistingLists
-        });
-    });
-}, _SpoFieldSetCommand_initOptions = function _SpoFieldSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--listId [listId]'
-    }, {
-        option: '--listTitle [listTitle]'
-    }, {
-        option: '--listUrl [listUrl]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '--internalName [internalName]'
-    }, {
-        option: '--updateExistingLists'
-    });
-}, _SpoFieldSetCommand_initValidators = function _SpoFieldSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        const listOptions = [args.options.listId, args.options.listTitle, args.options.listUrl];
-        if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either list id or title or list url, but not multiple`;
-        }
-        if (args.options.listId &&
-            !validation.isValidGuid(args.options.listId)) {
-            return `${args.options.listId} in option listId is not a valid GUID`;
-        }
-        if (args.options.id &&
-            !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} in option id is not a valid GUID`;
-        }
-        return true;
-    });
-}, _SpoFieldSetCommand_initOptionSets = function _SpoFieldSetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title', 'internalName'] });
-};
 export default new SpoFieldSetCommand();
 //# sourceMappingURL=field-set.js.map

package/dist/m365/spo/commands/file/file-archive.js

@@ -40,7 +40,7 @@ class SpoFileArchiveCommand extends SpoCommand {
     async commandAction(logger, args) {
         const { webUrl, url, id, force, verbose } = args.options;
         if (!force) {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you would like to archive this item? You will be able to reactivate it instantly for the first 7 days. After that, it will take up to 24 hours to reactivate.` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you would like to archive this file? You will be able to reactivate it instantly for the first 7 days. After that, it will take up to 24 hours to reactivate.` });
             if (!result) {
                 return;
             }

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

@@ -64,9 +64,10 @@ class SpoFileGetCommand extends SpoCommand {
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
-            // Set responseType to arraybuffer, otherwise binary data will be encoded
-            // to utf8 and binary data is corrupt
-            responseType: args.options.asFile ? 'stream' : 'json'
+            // Use stream for --asFile, so binary data is piped to disk as-is and
+            // isn't encoded to utf8 (which would corrupt it). Use text for
+            // --asString. Use json for all other cases.
+            responseType: args.options.asFile ? 'stream' : args.options.asString ? 'text' : 'json'
         };
         try {
             const file = await request.get(requestOptions);

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

@@ -46,7 +46,7 @@ class SpoFileRemoveCommand extends SpoCommand {
                 const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
                 requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')`;
             }
-            if (args.options.recycle) {
+            if (!args.options.permanent) {
                 requestUrl += `/recycle()`;
             }
             const requestOptions = {
@@ -73,7 +73,7 @@ class SpoFileRemoveCommand extends SpoCommand {
             await removeFile();
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to ${args.options.recycle ? 'recycle' : 'remove'} the file ${args.options.id || args.options.url} located in site ${args.options.webUrl}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to ${args.options.permanent ? 'permanently remove' : 'recycle'} the file ${args.options.id || args.options.url} located in site ${args.options.webUrl}?` });
             if (result) {
                 await removeFile();
             }
@@ -85,7 +85,7 @@ _SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelem
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
             url: typeof args.options.url !== 'undefined',
-            recycle: !!args.options.recycle,
+            permanent: !!args.options.permanent,
             bypassSharedLock: !!args.options.bypassSharedLock,
             force: !!args.options.force
         });
@@ -98,7 +98,7 @@ _SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelem
     }, {
         option: '--url [url]'
     }, {
-        option: '--recycle'
+        option: '--permanent'
     }, {
         option: '--bypassSharedLock'
     }, {
@@ -120,7 +120,7 @@ _SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelem
     this.optionSets.push({ options: ['id', 'url'] });
 }, _SpoFileRemoveCommand_initTypes = function _SpoFileRemoveCommand_initTypes() {
     this.types.string.push('webUrl', 'id', 'url');
-    this.types.boolean.push('recycle', 'bypassSharedLock', 'force');
+    this.types.boolean.push('permanent', 'bypassSharedLock', 'force');
 };
 export default new SpoFileRemoveCommand();
 //# sourceMappingURL=file-remove.js.map

package/dist/m365/spo/commands/file/file-unarchive.js

@@ -40,7 +40,7 @@ class SpoFileUnarchiveCommand extends SpoCommand {
     async commandAction(logger, args) {
         const { webUrl, url, id, force, verbose } = args.options;
         if (!force) {
-            const result = await cli.promptForConfirmation({ message: `Reactivation could take up to 24 hours. Files that are reactivated cannot be archived again for 30 days. Are you sure you would like to unarchive this item?` });
+            const result = await cli.promptForConfirmation({ message: `Reactivation could take up to 24 hours. Files that are reactivated cannot be archived again for a period of time. Are you sure you would like to unarchive this file?` });
             if (!result) {
                 return;
             }

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

@@ -40,7 +40,7 @@ class SpoFolderArchiveCommand extends SpoCommand {
     async commandAction(logger, args) {
         const { webUrl, url, id, force } = args.options;
         if (!force) {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you would like to archive this item? You will be able to reactivate it instantly for the first 7 days. After that, it will take up to 24 hours to reactivate.` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you would like to archive this folder? You will be able to reactivate it instantly for the first 7 days. After that, it will take up to 24 hours to reactivate.` });
             if (!result) {
                 return;
             }