@pnp/cli-microsoft365 12.0.0-beta.792164a → 12.0.0-beta.93e11fb

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

@@ -1,14 +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 _SpoSiteScriptAddCommand_instances, _SpoSiteScriptAddCommand_initTelemetry, _SpoSiteScriptAddCommand_initOptions, _SpoSiteScriptAddCommand_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';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    title: z.string().alias('t'),
+    content: z.string()
+        .refine(val => {
+        try {
+            JSON.parse(val);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }, {
+        error: 'Specified content value is not a valid JSON string.'
+    })
+        .alias('c'),
+    description: z.string().optional().alias('d')
+});
 class SpoSiteScriptAddCommand extends SpoCommand {
     get name() {
         return commands.SITESCRIPT_ADD;
@@ -16,12 +30,8 @@ class SpoSiteScriptAddCommand extends SpoCommand {
     get description() {
         return 'Adds site script for use with site designs';
     }
-    constructor() {
-        super();
-        _SpoSiteScriptAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSiteScriptAddCommand_instances, "m", _SpoSiteScriptAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoSiteScriptAddCommand_instances, "m", _SpoSiteScriptAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSiteScriptAddCommand_instances, "m", _SpoSiteScriptAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -45,30 +55,5 @@ class SpoSiteScriptAddCommand extends SpoCommand {
         }
     }
 }
-_SpoSiteScriptAddCommand_instances = new WeakSet(), _SpoSiteScriptAddCommand_initTelemetry = function _SpoSiteScriptAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            description: typeof args.options.description !== 'undefined'
-        });
-    });
-}, _SpoSiteScriptAddCommand_initOptions = function _SpoSiteScriptAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --title <title>'
-    }, {
-        option: '-c, --content <content>'
-    }, {
-        option: '-d, --description [description]'
-    });
-}, _SpoSiteScriptAddCommand_initValidators = function _SpoSiteScriptAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        try {
-            JSON.parse(args.options.content);
-        }
-        catch (e) {
-            return `Specified content value is not a valid JSON string. Error: ${e}`;
-        }
-        return true;
-    });
-};
 export default new SpoSiteScriptAddCommand();
 //# sourceMappingURL=sitescript-add.js.map

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

@@ -1,14 +1,14 @@
-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 _SpoSiteScriptGetCommand_instances, _SpoSiteScriptGetCommand_initOptions, _SpoSiteScriptGetCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
-import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.guid().alias('i'),
+    content: z.boolean().optional().alias('c')
+});
 class SpoSiteScriptGetCommand extends SpoCommand {
     get name() {
         return commands.SITESCRIPT_GET;
@@ -16,11 +16,8 @@ class SpoSiteScriptGetCommand extends SpoCommand {
     get description() {
         return 'Gets information about the specified site script';
     }
-    constructor() {
-        super();
-        _SpoSiteScriptGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSiteScriptGetCommand_instances, "m", _SpoSiteScriptGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSiteScriptGetCommand_instances, "m", _SpoSiteScriptGetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -49,19 +46,5 @@ class SpoSiteScriptGetCommand extends SpoCommand {
         }
     }
 }
-_SpoSiteScriptGetCommand_instances = new WeakSet(), _SpoSiteScriptGetCommand_initOptions = function _SpoSiteScriptGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
-        option: '-c, --content'
-    });
-}, _SpoSiteScriptGetCommand_initValidators = function _SpoSiteScriptGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        return true;
-    });
-};
 export default new SpoSiteScriptGetCommand();
 //# sourceMappingURL=sitescript-get.js.map

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

@@ -1,7 +1,9 @@
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = globalOptionsZod.strict();
 class SpoSiteScriptListCommand extends SpoCommand {
     get name() {
         return commands.SITESCRIPT_LIST;
@@ -9,6 +11,9 @@ class SpoSiteScriptListCommand extends SpoCommand {
     get description() {
         return 'Lists site script available for use with site designs';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         try {
             const spoUrl = await spo.getSpoUrl(logger, this.debug);

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

@@ -1,15 +1,15 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SpoSiteScriptRemoveCommand_instances, _SpoSiteScriptRemoveCommand_initTelemetry, _SpoSiteScriptRemoveCommand_initOptions, _SpoSiteScriptRemoveCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
-import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.guid().alias('i'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoSiteScriptRemoveCommand extends SpoCommand {
     get name() {
         return commands.SITESCRIPT_REMOVE;
@@ -17,12 +17,8 @@ class SpoSiteScriptRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes the specified site script';
     }
-    constructor() {
-        super();
-        _SpoSiteScriptRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSiteScriptRemoveCommand_instances, "m", _SpoSiteScriptRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoSiteScriptRemoveCommand_instances, "m", _SpoSiteScriptRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSiteScriptRemoveCommand_instances, "m", _SpoSiteScriptRemoveCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -56,25 +52,5 @@ class SpoSiteScriptRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoSiteScriptRemoveCommand_instances = new WeakSet(), _SpoSiteScriptRemoveCommand_initTelemetry = function _SpoSiteScriptRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: args.options.force || false
-        });
-    });
-}, _SpoSiteScriptRemoveCommand_initOptions = function _SpoSiteScriptRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoSiteScriptRemoveCommand_initValidators = function _SpoSiteScriptRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        return true;
-    });
-};
 export default new SpoSiteScriptRemoveCommand();
 //# sourceMappingURL=sitescript-remove.js.map

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

@@ -1,14 +1,34 @@
-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 _SpoSiteScriptSetCommand_instances, _SpoSiteScriptSetCommand_initTelemetry, _SpoSiteScriptSetCommand_initOptions, _SpoSiteScriptSetCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
-import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.guid().alias('i'),
+    title: z.string().optional().alias('t'),
+    description: z.string().optional().alias('d'),
+    version: z.string()
+        .refine(val => validation.isValidPositiveInteger(val), {
+        error: 'Version must be a number.'
+    })
+        .optional().alias('v'),
+    content: z.string()
+        .refine(val => {
+        try {
+            JSON.parse(val);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }, {
+        error: 'Specified content value is not a valid JSON string.'
+    })
+        .optional().alias('c')
+});
 class SpoSiteScriptSetCommand extends SpoCommand {
     get name() {
         return commands.SITESCRIPT_SET;
@@ -16,12 +36,8 @@ class SpoSiteScriptSetCommand extends SpoCommand {
     get description() {
         return 'Updates existing site script';
     }
-    constructor() {
-        super();
-        _SpoSiteScriptSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSiteScriptSetCommand_instances, "m", _SpoSiteScriptSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoSiteScriptSetCommand_instances, "m", _SpoSiteScriptSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSiteScriptSetCommand_instances, "m", _SpoSiteScriptSetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -60,48 +76,5 @@ class SpoSiteScriptSetCommand extends SpoCommand {
         }
     }
 }
-_SpoSiteScriptSetCommand_instances = new WeakSet(), _SpoSiteScriptSetCommand_initTelemetry = function _SpoSiteScriptSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            title: (!(!args.options.title)).toString(),
-            description: (!(!args.options.description)).toString(),
-            version: (!(!args.options.version)).toString(),
-            content: (!(!args.options.content)).toString()
-        });
-    });
-}, _SpoSiteScriptSetCommand_initOptions = function _SpoSiteScriptSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '-v, --version [version]'
-    }, {
-        option: '-c, --content [content]'
-    });
-}, _SpoSiteScriptSetCommand_initValidators = function _SpoSiteScriptSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (args.options.version) {
-            const version = parseInt(args.options.version);
-            if (isNaN(version)) {
-                return `${args.options.version} is not a number`;
-            }
-        }
-        if (args.options.content) {
-            try {
-                JSON.parse(args.options.content);
-            }
-            catch (e) {
-                return `Specified content value is not a valid JSON string. Error: ${e}`;
-            }
-        }
-        return true;
-    });
-};
 export default new SpoSiteScriptSetCommand();
 //# sourceMappingURL=sitescript-set.js.map

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-add.js

@@ -111,6 +111,13 @@ class SpoTenantApplicationCustomizerAddCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr('Pre-checks finished. Adding tenant wide extension to the TenantWideExtensions list');
         }
+        const output = options.output === 'text' ||
+            options.output === 'csv' ||
+            options.output === 'json' ||
+            options.output === 'md' ||
+            options.output === 'none'
+            ? options.output
+            : undefined;
         const commandOptions = {
             webUrl: appCatalogUrl,
             listUrl: `${urlUtil.getServerRelativeSiteUrl(appCatalogUrl)}/Lists/TenantWideExtensions`,
@@ -125,7 +132,7 @@ class SpoTenantApplicationCustomizerAddCommand extends SpoCommand {
             TenantWideExtensionDisabled: false,
             verbose: this.verbose,
             debug: this.debug,
-            output: options.output
+            output: output
         };
         await cli.executeCommand(spoListItemAddCommand, { options: { ...commandOptions, _: [] } });
     }

package/dist/m365/spo/commands/tenant/tenant-commandset-add.js

@@ -111,6 +111,13 @@ class SpoTenantCommandSetAddCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr('Pre-checks finished. Adding tenant wide extension to the TenantWideExtensions list');
         }
+        const output = options.output === 'text' ||
+            options.output === 'csv' ||
+            options.output === 'json' ||
+            options.output === 'md' ||
+            options.output === 'none'
+            ? options.output
+            : undefined;
         const commandOptions = {
             webUrl: appCatalogUrl,
             listUrl: `${urlUtil.getServerRelativeSiteUrl(appCatalogUrl)}/Lists/TenantWideExtensions`,
@@ -124,7 +131,7 @@ class SpoTenantCommandSetAddCommand extends SpoCommand {
             TenantWideExtensionDisabled: false,
             verbose: this.verbose,
             debug: this.debug,
-            output: options.output
+            output: output
         };
         await cli.executeCommand(spoListItemAddCommand, { options: { ...commandOptions, _: [] } });
     }

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

@@ -6,6 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoTermGroupListCommand_instances, _SpoTermGroupListCommand_initTelemetry, _SpoTermGroupListCommand_initOptions, _SpoTermGroupListCommand_initValidators;
 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';
@@ -48,14 +49,12 @@ 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);

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

@@ -51,15 +51,12 @@ class SpoTermSetListCommand extends SpoCommand {
                 throw response.ErrorInfo.ErrorMessage;
             }
             const result = json[json.length - 1];
-            if (result._Child_Items_ && result._Child_Items_.length > 0) {
-                result._Child_Items_.map(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();
-                    return t;
-                });
-                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);

package/dist/m365/spo/commands.js

@@ -72,6 +72,7 @@ export default {
     FILE_MOVE: `${prefix} file move`,
     FILE_REMOVE: `${prefix} file remove`,
     FILE_RENAME: `${prefix} file rename`,
+    FILE_UNARCHIVE: `${prefix} file unarchive`,
     FILE_RETENTIONLABEL_ENSURE: `${prefix} file retentionlabel ensure`,
     FILE_RETENTIONLABEL_REMOVE: `${prefix} file retentionlabel remove`,
     FILE_ROLEASSIGNMENT_ADD: `${prefix} file roleassignment add`,
@@ -85,7 +86,6 @@ export default {
     FILE_SHARINGLINK_LIST: `${prefix} file sharinglink list`,
     FILE_SHARINGLINK_REMOVE: `${prefix} file sharinglink remove`,
     FILE_SHARINGLINK_SET: `${prefix} file sharinglink set`,
-    FILE_UNARCHIVE: `${prefix} file unarchive`,
     FILE_VERSION_CLEAR: `${prefix} file version clear`,
     FILE_VERSION_GET: `${prefix} file version get`,
     FILE_VERSION_KEEP: `${prefix} file version keep`,
@@ -112,6 +112,7 @@ export default {
     FOLDER_SHARINGLINK_LIST: `${prefix} folder sharinglink list`,
     FOLDER_SHARINGLINK_REMOVE: `${prefix} folder sharinglink remove`,
     FOLDER_SHARINGLINK_SET: `${prefix} folder sharinglink set`,
+    FOLDER_UNARCHIVE: `${prefix} folder unarchive`,
     GET: `${prefix} get`,
     GROUP_ADD: `${prefix} group add`,
     GROUP_GET: `${prefix} group get`,
@@ -235,6 +236,7 @@ export default {
     PAGE_TEMPLATE_LIST: `${prefix} page template list`,
     PAGE_TEMPLATE_REMOVE: `${prefix} page template remove`,
     PAGE_TEXT_ADD: `${prefix} page text add`,
+    PAGE_UNPUBLISH: `${prefix} page unpublish`,
     PROPERTYBAG_GET: `${prefix} propertybag get`,
     PROPERTYBAG_LIST: `${prefix} propertybag list`,
     PROPERTYBAG_REMOVE: `${prefix} propertybag remove`,

package/dist/m365/spp/commands/contentcenter/contentcenter-list.js

@@ -1,8 +1,10 @@
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = globalOptionsZod.strict();
 class SppContentCenterListCommand extends SpoCommand {
     get name() {
         return commands.CONTENTCENTER_LIST;
@@ -13,6 +15,9 @@ class SppContentCenterListCommand extends SpoCommand {
     defaultProperties() {
         return ['Title', 'Url'];
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         try {
             if (this.verbose) {

package/dist/m365/spp/commands/model/model-get.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 _SppModelGetCommand_instances, _SppModelGetCommand_initTelemetry, _SppModelGetCommand_initOptions, _SppModelGetCommand_initValidators, _SppModelGetCommand_initOptionSets, _SppModelGetCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import { spp } from '../../../../utils/spp.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,
+    siteUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u'),
+    id: z.guid().optional().alias('i'),
+    title: z.string().optional().alias('t'),
+    withPublications: z.boolean().optional()
+});
 class SppModelGetCommand extends SpoCommand {
     get name() {
         return commands.MODEL_GET;
@@ -17,14 +24,18 @@ class SppModelGetCommand extends SpoCommand {
     get description() {
         return 'Retrieves information about a document understanding model';
     }
-    constructor() {
-        super();
-        _SppModelGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SppModelGetCommand_instances, "m", _SppModelGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SppModelGetCommand_instances, "m", _SppModelGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SppModelGetCommand_instances, "m", _SppModelGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SppModelGetCommand_instances, "m", _SppModelGetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SppModelGetCommand_instances, "m", _SppModelGetCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.title].filter(x => x !== undefined).length === 1, {
+            message: `Specify either 'id' or 'title', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'title']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -56,36 +67,5 @@ class SppModelGetCommand extends SpoCommand {
         }
     }
 }
-_SppModelGetCommand_instances = new WeakSet(), _SppModelGetCommand_initTelemetry = function _SppModelGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            title: typeof args.options.title !== 'undefined',
-            withPublications: !!args.options.withPublications
-        });
-    });
-}, _SppModelGetCommand_initOptions = function _SppModelGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --siteUrl <siteUrl>'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '--withPublications'
-    });
-}, _SppModelGetCommand_initValidators = function _SppModelGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID for option 'id'.`;
-        }
-        return validation.isValidSharePointUrl(args.options.siteUrl);
-    });
-}, _SppModelGetCommand_initOptionSets = function _SppModelGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title'] });
-}, _SppModelGetCommand_initTypes = function _SppModelGetCommand_initTypes() {
-    this.types.string.push('siteUrl', 'id', 'title');
-    this.types.boolean.push('withPublications');
-};
 export default new SppModelGetCommand();
 //# sourceMappingURL=model-get.js.map

package/dist/m365/spp/commands/model/model-list.js

@@ -1,15 +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 _SppModelListCommand_instances, _SppModelListCommand_initOptions, _SppModelListCommand_initTypes, _SppModelListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import { spp } from '../../../../utils/spp.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,
+    siteUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u')
+});
 class SppModelListCommand extends SpoCommand {
     get name() {
         return commands.MODEL_LIST;
@@ -20,12 +24,8 @@ class SppModelListCommand extends SpoCommand {
     defaultProperties() {
         return ['AIBuilderHybridModelType', 'ContentTypeName', 'LastTrained', 'UniqueId'];
     }
-    constructor() {
-        super();
-        _SppModelListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SppModelListCommand_instances, "m", _SppModelListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SppModelListCommand_instances, "m", _SppModelListCommand_initTypes).call(this);
-        __classPrivateFieldGet(this, _SppModelListCommand_instances, "m", _SppModelListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -42,16 +42,5 @@ class SppModelListCommand extends SpoCommand {
         }
     }
 }
-_SppModelListCommand_instances = new WeakSet(), _SppModelListCommand_initOptions = function _SppModelListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --siteUrl <siteUrl>'
-    });
-}, _SppModelListCommand_initTypes = function _SppModelListCommand_initTypes() {
-    this.types.string.push('siteUrl');
-}, _SppModelListCommand_initValidators = function _SppModelListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        return validation.isValidSharePointUrl(args.options.siteUrl);
-    });
-};
 export default new SppModelListCommand();
 //# sourceMappingURL=model-list.js.map