@pnp/cli-microsoft365 12.0.0-beta.792164a → 12.0.0-beta.8769a5e

package/dist/m365/spo/commands/term/term-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 _SpoTermAddCommand_instances, _SpoTermAddCommand_initTelemetry, _SpoTermAddCommand_initOptions, _SpoTermAddCommand_initValidators, _SpoTermAddCommand_initOptionSets;
 import { v4 } from 'uuid';
+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';
@@ -12,6 +8,20 @@ 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,
+    name: z.string().alias('n'),
+    webUrl: z.string().optional().alias('u'),
+    termSetId: z.string().optional(),
+    termSetName: z.string().optional(),
+    termGroupId: z.string().optional(),
+    termGroupName: z.string().optional(),
+    id: z.string().optional().alias('i'),
+    description: z.string().optional().alias('d'),
+    parentTermId: z.string().optional(),
+    customProperties: z.string().optional(),
+    localCustomProperties: z.string().optional()
+});
 class SpoTermAddCommand extends SpoCommand {
     get name() {
         return commands.TERM_ADD;
@@ -19,13 +29,85 @@ class SpoTermAddCommand extends SpoCommand {
     get description() {
         return 'Adds taxonomy term';
     }
-    constructor() {
-        super();
-        _SpoTermAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTermAddCommand_instances, "m", _SpoTermAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTermAddCommand_instances, "m", _SpoTermAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTermAddCommand_instances, "m", _SpoTermAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoTermAddCommand_instances, "m", _SpoTermAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => {
+            if (opts.webUrl) {
+                return validation.isValidSharePointUrl(opts.webUrl) === true;
+            }
+            return true;
+        }, { message: 'Invalid SharePoint URL' })
+            .refine(opts => {
+            if (opts.id && !validation.isValidGuid(opts.id)) {
+                return false;
+            }
+            return true;
+        }, { error: e => `${e.input.id} is not a valid GUID` })
+            .refine(opts => {
+            if (opts.parentTermId && !validation.isValidGuid(opts.parentTermId)) {
+                return false;
+            }
+            return true;
+        }, { error: e => `${e.input.parentTermId} is not a valid GUID` })
+            .refine(opts => {
+            if (opts.parentTermId && (opts.termSetId || opts.termSetName)) {
+                return false;
+            }
+            return true;
+        }, { message: 'Specify either parentTermId, termSetId or termSetName but not both' })
+            .refine(opts => {
+            if (opts.termGroupId && !validation.isValidGuid(opts.termGroupId)) {
+                return false;
+            }
+            return true;
+        }, { error: e => `${e.input.termGroupId} is not a valid GUID` })
+            .refine(opts => {
+            if (!opts.termSetId && !opts.termSetName && !opts.parentTermId) {
+                return false;
+            }
+            return true;
+        }, { message: 'Specify termSetId, termSetName or parentTermId' })
+            .refine(opts => {
+            if (opts.termSetId && opts.termSetName) {
+                return false;
+            }
+            return true;
+        }, { message: 'Specify termSetId or termSetName but not both' })
+            .refine(opts => {
+            if (opts.termSetId && !validation.isValidGuid(opts.termSetId)) {
+                return false;
+            }
+            return true;
+        }, { error: e => `${e.input.termSetId} is not a valid GUID` })
+            .refine(opts => {
+            if (opts.customProperties) {
+                try {
+                    JSON.parse(opts.customProperties);
+                }
+                catch {
+                    return false;
+                }
+            }
+            return true;
+        }, { message: 'customProperties is not valid JSON' })
+            .refine(opts => {
+            if (opts.localCustomProperties) {
+                try {
+                    JSON.parse(opts.localCustomProperties);
+                }
+                catch {
+                    return false;
+                }
+            }
+            return true;
+        }, { message: 'localCustomProperties is not valid JSON' })
+            .refine(opts => [opts.termGroupId, opts.termGroupName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either termGroupId or termGroupName, but not both.',
+            params: { customCode: 'optionSet', options: ['termGroupId', 'termGroupName'] }
+        });
     }
     async commandAction(logger, args) {
         let term;
@@ -123,102 +205,5 @@ class SpoTermAddCommand extends SpoCommand {
         }
     }
 }
-_SpoTermAddCommand_instances = new WeakSet(), _SpoTermAddCommand_initTelemetry = function _SpoTermAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            webUrl: typeof args.options.webUrl !== 'undefined',
-            customProperties: typeof args.options.customProperties !== 'undefined',
-            description: typeof args.options.description !== 'undefined',
-            id: typeof args.options.id !== 'undefined',
-            localCustomProperties: typeof args.options.localCustomProperties !== 'undefined',
-            parentTermId: typeof args.options.parentTermId !== 'undefined',
-            termGroupId: typeof args.options.termGroupId !== 'undefined',
-            termGroupName: typeof args.options.termGroupName !== 'undefined',
-            termSetId: typeof args.options.termSetId !== 'undefined',
-            termSetName: typeof args.options.termSetName !== 'undefined'
-        });
-    });
-}, _SpoTermAddCommand_initOptions = function _SpoTermAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name <name>'
-    }, {
-        option: '-u, --webUrl [webUrl]'
-    }, {
-        option: '--termSetId [termSetId]'
-    }, {
-        option: '--termSetName [termSetName]'
-    }, {
-        option: '--termGroupId [termGroupId]'
-    }, {
-        option: '--termGroupName [termGroupName]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '--parentTermId [parentTermId]'
-    }, {
-        option: '--customProperties [customProperties]'
-    }, {
-        option: '--localCustomProperties [localCustomProperties]'
-    });
-}, _SpoTermAddCommand_initValidators = function _SpoTermAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.webUrl) {
-            const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-            if (isValidSharePointUrl !== true) {
-                return isValidSharePointUrl;
-            }
-        }
-        if (args.options.id) {
-            if (!validation.isValidGuid(args.options.id)) {
-                return `${args.options.id} is not a valid GUID`;
-            }
-        }
-        if (args.options.parentTermId) {
-            if (!validation.isValidGuid(args.options.parentTermId)) {
-                return `${args.options.parentTermId} is not a valid GUID`;
-            }
-            if (args.options.termSetId || args.options.termSetName) {
-                return 'Specify either parentTermId, termSetId or termSetName but not both';
-            }
-        }
-        if (args.options.termGroupId) {
-            if (!validation.isValidGuid(args.options.termGroupId)) {
-                return `${args.options.termGroupId} is not a valid GUID`;
-            }
-        }
-        if (!args.options.termSetId && !args.options.termSetName && !args.options.parentTermId) {
-            return 'Specify termSetId, termSetName or parentTermId';
-        }
-        if (args.options.termSetId && args.options.termSetName) {
-            return 'Specify termSetId or termSetName but not both';
-        }
-        if (args.options.termSetId) {
-            if (!validation.isValidGuid(args.options.termSetId)) {
-                return `${args.options.termSetId} is not a valid GUID`;
-            }
-        }
-        if (args.options.customProperties) {
-            try {
-                JSON.parse(args.options.customProperties);
-            }
-            catch (e) {
-                return `An error has occurred while parsing customProperties: ${e}`;
-            }
-        }
-        if (args.options.localCustomProperties) {
-            try {
-                JSON.parse(args.options.localCustomProperties);
-            }
-            catch (e) {
-                return `An error has occurred while parsing localCustomProperties: ${e}`;
-            }
-        }
-        return true;
-    });
-}, _SpoTermAddCommand_initOptionSets = function _SpoTermAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['termGroupId', 'termGroupName'] });
-};
 export default new SpoTermAddCommand();
 //# sourceMappingURL=term-add.js.map

package/dist/m365/spo/commands/term/term-get.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 _SpoTermGetCommand_instances, _SpoTermGetCommand_initTelemetry, _SpoTermGetCommand_initOptions, _SpoTermGetCommand_initValidators, _SpoTermGetCommand_initOptionSets;
+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';
@@ -12,6 +8,16 @@ 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,
+    webUrl: z.string().optional().alias('u'),
+    id: z.string().optional().alias('i'),
+    name: z.string().optional().alias('n'),
+    termGroupId: z.string().optional(),
+    termGroupName: z.string().optional(),
+    termSetId: z.string().optional(),
+    termSetName: z.string().optional()
+});
 class SpoTermGetCommand extends SpoCommand {
     get name() {
         return commands.TERM_GET;
@@ -19,13 +25,57 @@ class SpoTermGetCommand extends SpoCommand {
     get description() {
         return 'Gets information about the specified taxonomy term';
     }
-    constructor() {
-        super();
-        _SpoTermGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTermGetCommand_instances, "m", _SpoTermGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTermGetCommand_instances, "m", _SpoTermGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTermGetCommand_instances, "m", _SpoTermGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoTermGetCommand_instances, "m", _SpoTermGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => {
+            if (opts.webUrl) {
+                return validation.isValidSharePointUrl(opts.webUrl) === true;
+            }
+            return true;
+        }, { message: 'Invalid SharePoint URL' })
+            .refine(opts => {
+            if (opts.id && !validation.isValidGuid(opts.id)) {
+                return false;
+            }
+            return true;
+        }, { error: e => `${e.input.id} is not a valid GUID` })
+            .refine(opts => {
+            if (opts.termGroupId && !validation.isValidGuid(opts.termGroupId)) {
+                return false;
+            }
+            return true;
+        }, { error: e => `${e.input.termGroupId} is not a valid GUID` })
+            .refine(opts => {
+            if (opts.termSetId && !validation.isValidGuid(opts.termSetId)) {
+                return false;
+            }
+            return true;
+        }, { error: e => `${e.input.termSetId} is not a valid GUID` })
+            .refine(opts => [opts.id, opts.name].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either id or name, but not both.',
+            params: { customCode: 'optionSet', options: ['id', 'name'] }
+        })
+            .refine(opts => {
+            if (opts.name !== undefined) {
+                return [opts.termGroupId, opts.termGroupName].filter(x => x !== undefined).length === 1;
+            }
+            return true;
+        }, {
+            message: 'Specify either termGroupId or termGroupName, but not both.',
+            params: { customCode: 'optionSet', options: ['termGroupId', 'termGroupName'] }
+        })
+            .refine(opts => {
+            if (opts.name !== undefined) {
+                return [opts.termSetId, opts.termSetName].filter(x => x !== undefined).length === 1;
+            }
+            return true;
+        }, {
+            message: 'Specify either termSetId or termSetName, but not both.',
+            params: { customCode: 'optionSet', options: ['termSetId', 'termSetName'] }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -97,67 +147,5 @@ class SpoTermGetCommand extends SpoCommand {
         return new Date(Number(dateAsString.replace('/Date(', '').replace(')/', ''))).toISOString();
     }
 }
-_SpoTermGetCommand_instances = new WeakSet(), _SpoTermGetCommand_initTelemetry = function _SpoTermGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            webUrl: typeof args.options.webUrl !== 'undefined',
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined',
-            termGroupId: typeof args.options.termGroupId !== 'undefined',
-            termGroupName: typeof args.options.termGroupName !== 'undefined',
-            termSetId: typeof args.options.termSetId !== 'undefined',
-            termSetName: typeof args.options.termSetName !== 'undefined'
-        });
-    });
-}, _SpoTermGetCommand_initOptions = function _SpoTermGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl [webUrl]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    }, {
-        option: '--termGroupId [termGroupId]'
-    }, {
-        option: '--termGroupName [termGroupName]'
-    }, {
-        option: '--termSetId [termSetId]'
-    }, {
-        option: '--termSetName [termSetName]'
-    });
-}, _SpoTermGetCommand_initValidators = function _SpoTermGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.webUrl) {
-            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.termGroupId && !validation.isValidGuid(args.options.termGroupId)) {
-            return `${args.options.termGroupId} is not a valid GUID`;
-        }
-        if (args.options.termSetId && !validation.isValidGuid(args.options.termSetId)) {
-            return `${args.options.termSetId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _SpoTermGetCommand_initOptionSets = function _SpoTermGetCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['id', 'name']
-    }, {
-        options: ['termGroupId', 'termGroupName'],
-        runsWhen: (args) => {
-            return args.options.name !== undefined;
-        }
-    }, {
-        options: ['termSetId', 'termSetName'],
-        runsWhen: (args) => {
-            return args.options.name !== undefined;
-        }
-    });
-};
 export default new SpoTermGetCommand();
 //# sourceMappingURL=term-get.js.map

package/dist/m365/spo/commands/term/term-group-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 _SpoTermGroupAddCommand_instances, _SpoTermGroupAddCommand_initTelemetry, _SpoTermGroupAddCommand_initOptions, _SpoTermGroupAddCommand_initValidators;
+import { z } from 'zod';
 import { v4 } from 'uuid';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -12,6 +8,13 @@ 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,
+    name: z.string().alias('n'),
+    id: z.string().optional().alias('i').refine(val => val === undefined || validation.isValidGuid(val), { error: e => `${e.input} is not a valid GUID` }),
+    description: z.string().optional().alias('d'),
+    webUrl: z.string().optional().alias('u').refine(val => val === undefined || validation.isValidSharePointUrl(val) === true, { message: 'Invalid SharePoint URL' })
+});
 class SpoTermGroupAddCommand extends SpoCommand {
     get name() {
         return commands.TERM_GROUP_ADD;
@@ -19,12 +22,8 @@ class SpoTermGroupAddCommand extends SpoCommand {
     get description() {
         return 'Adds taxonomy term group';
     }
-    constructor() {
-        super();
-        _SpoTermGroupAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTermGroupAddCommand_instances, "m", _SpoTermGroupAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTermGroupAddCommand_instances, "m", _SpoTermGroupAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTermGroupAddCommand_instances, "m", _SpoTermGroupAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         let termGroup;
@@ -99,34 +98,5 @@ class SpoTermGroupAddCommand extends SpoCommand {
         }
     }
 }
-_SpoTermGroupAddCommand_instances = new WeakSet(), _SpoTermGroupAddCommand_initTelemetry = function _SpoTermGroupAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            description: typeof args.options.id !== 'undefined',
-            id: typeof args.options.id !== 'undefined',
-            webUrl: typeof args.options.webUrl !== 'undefined'
-        });
-    });
-}, _SpoTermGroupAddCommand_initOptions = function _SpoTermGroupAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name <name>'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '-u, --webUrl [webUrl]'
-    });
-}, _SpoTermGroupAddCommand_initValidators = function _SpoTermGroupAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (args.options.webUrl) {
-            return validation.isValidSharePointUrl(args.options.webUrl);
-        }
-        return true;
-    });
-};
 export default new SpoTermGroupAddCommand();
 //# sourceMappingURL=term-group-add.js.map

package/dist/m365/spo/commands/term/term-group-get.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 _SpoTermGroupGetCommand_instances, _SpoTermGroupGetCommand_initTelemetry, _SpoTermGroupGetCommand_initOptions, _SpoTermGroupGetCommand_initValidators, _SpoTermGroupGetCommand_initOptionSets;
+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,
+    webUrl: z.string().optional().alias('u').refine(val => val === undefined || validation.isValidSharePointUrl(val) === true, { message: 'Invalid SharePoint URL' }),
+    id: z.string().optional().alias('i').refine(val => val === undefined || validation.isValidGuid(val), { error: e => `${e.input} is not a valid GUID` }),
+    name: z.string().optional().alias('n')
+});
 class SpoTermGroupGetCommand extends SpoCommand {
     get name() {
         return commands.TERM_GROUP_GET;
@@ -18,13 +20,14 @@ class SpoTermGroupGetCommand extends SpoCommand {
     get description() {
         return 'Gets information about the specified taxonomy term group';
     }
-    constructor() {
-        super();
-        _SpoTermGroupGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTermGroupGetCommand_instances, "m", _SpoTermGroupGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTermGroupGetCommand_instances, "m", _SpoTermGroupGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTermGroupGetCommand_instances, "m", _SpoTermGroupGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoTermGroupGetCommand_instances, "m", _SpoTermGroupGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema.refine(opts => [opts.id, opts.name].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either id or name, but not both.',
+            params: { customCode: 'optionSet', options: ['id', 'name'] }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -60,39 +63,5 @@ class SpoTermGroupGetCommand extends SpoCommand {
         }
     }
 }
-_SpoTermGroupGetCommand_instances = new WeakSet(), _SpoTermGroupGetCommand_initTelemetry = function _SpoTermGroupGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            webUrl: typeof args.options.webUrl !== 'undefined',
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined'
-        });
-    });
-}, _SpoTermGroupGetCommand_initOptions = function _SpoTermGroupGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl [webUrl]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    });
-}, _SpoTermGroupGetCommand_initValidators = function _SpoTermGroupGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.webUrl) {
-            const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-            if (isValidSharePointUrl !== true) {
-                return isValidSharePointUrl;
-            }
-        }
-        if (args.options.id) {
-            if (!validation.isValidGuid(args.options.id)) {
-                return `${args.options.id} is not a valid GUID`;
-            }
-        }
-        return true;
-    });
-}, _SpoTermGroupGetCommand_initOptionSets = function _SpoTermGroupGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-};
 export default new SpoTermGroupGetCommand();
 //# sourceMappingURL=term-group-get.js.map

package/dist/m365/spo/commands/term/term-group-list.js

@@ -1,15 +1,16 @@
-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 _SpoTermGroupListCommand_instances, _SpoTermGroupListCommand_initTelemetry, _SpoTermGroupListCommand_initOptions, _SpoTermGroupListCommand_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';
 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,
+    webUrl: z.string().optional().alias('u').refine(val => val === undefined || validation.isValidSharePointUrl(val) === true, { message: 'Invalid SharePoint URL' })
+});
 class SpoTermGroupListCommand extends SpoCommand {
     get name() {
         return commands.TERM_GROUP_LIST;
@@ -17,16 +18,12 @@ class SpoTermGroupListCommand extends SpoCommand {
     get description() {
         return 'Lists taxonomy term groups';
     }
+    get schema() {
+        return options;
+    }
     defaultProperties() {
         return ['Id', 'Name'];
     }
-    constructor() {
-        super();
-        _SpoTermGroupListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTermGroupListCommand_instances, "m", _SpoTermGroupListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTermGroupListCommand_instances, "m", _SpoTermGroupListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTermGroupListCommand_instances, "m", _SpoTermGroupListCommand_initValidators).call(this);
-    }
     async commandAction(logger, args) {
         try {
             const spoWebUrl = args.options.webUrl ? args.options.webUrl : await spo.getSpoAdminUrl(logger, this.debug);
@@ -48,40 +45,17 @@ class SpoTermGroupListCommand extends SpoCommand {
                 throw response.ErrorInfo.ErrorMessage;
             }
             const result = json[json.length - 1];
-            if (result._Child_Items_ && result._Child_Items_.length > 0) {
-                result._Child_Items_.forEach(t => {
-                    t.CreatedDate = new Date(Number(t.CreatedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
-                    t.Id = t.Id.replace('/Guid(', '').replace(')/', '');
-                    t.LastModifiedDate = new Date(Number(t.LastModifiedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
-                });
-                await logger.log(result._Child_Items_);
-            }
+            result._Child_Items_.forEach(t => {
+                t.CreatedDate = new Date(Number(t.CreatedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
+                t.Id = formatting.extractCsomGuid(t.Id);
+                t.LastModifiedDate = new Date(Number(t.LastModifiedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
+            });
+            await logger.log(result._Child_Items_);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
 }
-_SpoTermGroupListCommand_instances = new WeakSet(), _SpoTermGroupListCommand_initTelemetry = function _SpoTermGroupListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            webUrl: typeof args.options.webUrl !== 'undefined'
-        });
-    });
-}, _SpoTermGroupListCommand_initOptions = function _SpoTermGroupListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl [webUrl]'
-    });
-}, _SpoTermGroupListCommand_initValidators = function _SpoTermGroupListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.webUrl) {
-            const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-            if (isValidSharePointUrl !== true) {
-                return isValidSharePointUrl;
-            }
-        }
-        return true;
-    });
-};
 export default new SpoTermGroupListCommand();
 //# sourceMappingURL=term-group-list.js.map