@swell/cli 2.0.1-alpha.13 → 2.0.1-alpha.16

package/dist/commands/create/content.js

@@ -25,11 +25,6 @@ export default class CreateContent extends CreateCollectionCommand {
         },
     ];
     static flags = {
-        label: Flags.string({
-            char: 'l',
-            default: '',
-            description: 'content model label',
-        }),
         description: Flags.string({
             char: 'd',
             default: '',
@@ -40,21 +35,26 @@ export default class CreateContent extends CreateCollectionCommand {
             default: '',
             description: 'list of content model fields delimited by commas',
         }),
-        views: Flags.string({
-            char: 'v',
+        label: Flags.string({
+            char: 'l',
             default: '',
-            description: 'list of content model views delimited by commas, i.e. list,edit,new',
+            description: 'content model label',
         }),
         overwrite: Flags.boolean({
             default: false,
             description: 'overwrite existing content model configuration file',
         }),
+        views: Flags.string({
+            char: 'v',
+            default: '',
+            description: 'list of content model views delimited by commas, i.e. list,edit,new',
+        }),
     };
     static summary = 'Initialize a content UI model config file with properties in the content folder.';
     createType = ConfigType.CONTENT;
     async run() {
         const { flags } = await this.parse(CreateContent);
-        const { label, description, collection } = await this.promptCollection();
+        const { collection, description, label } = await this.promptCollection();
         const fileName = toFileName(collection);
         const fileBody = {
             collection,
@@ -70,12 +70,12 @@ export default class CreateContent extends CreateCollectionCommand {
         }
         else {
             const viewsInput = await checkbox({
-                message: 'Which views does your content have?',
                 choices: [
                     { name: 'List view', value: 'list' },
                     { name: 'Edit view', value: 'edit' },
                     { name: 'New view', value: 'new' },
                 ],
+                message: 'Which views does your content have?',
             });
             fileBody.views = parseViews(viewsInput);
         }

package/dist/commands/create/function.d.ts

@@ -13,9 +13,9 @@ export default class CreateFunction extends CreateCommand {
     static flags: {
         description: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         events: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        overwrite: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         route: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         schedule: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        overwrite: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     static summary: string;
     createType: ConfigType;

package/dist/commands/create/function.js

@@ -45,6 +45,10 @@ export default class CreateFunction extends CreateCommand {
             default: '',
             description: 'list of data model events used with model trigger, delimited by commas',
         }),
+        overwrite: Flags.boolean({
+            default: false,
+            description: 'overwrite existing function file',
+        }),
         route: Flags.string({
             char: 'r',
             default: 'public',
@@ -56,25 +60,21 @@ export default class CreateFunction extends CreateCommand {
             default: '',
             description: 'crontab value used with cron trigger',
         }),
-        overwrite: Flags.boolean({
-            default: false,
-            description: 'overwrite existing function file',
-        }),
     };
     static summary = 'Initialize a functions script in JavaScript or TypeScript.';
     createType = ConfigType.FUNCTION;
     async run() {
         const { args, flags } = await this.parse(CreateFunction);
         const { functionName, trigger } = args;
-        const { description, events, route, schedule, overwrite } = flags;
+        const { description, events, overwrite, route, schedule } = flags;
         let writeFunctionFileParams = {
             description,
             events,
-            route,
             functionName: functionName || '',
             language: (functionName?.includes('.ts')
                 ? 'ts'
                 : 'js'),
+            route,
             schedule,
             trigger: trigger,
         };
@@ -85,7 +85,7 @@ export default class CreateFunction extends CreateCommand {
         await this.writeFunctionFile(writeFunctionFileParams, overwrite);
     }
     async gatherInput(params) {
-        let language = params.language;
+        let { language } = params;
         if (!language) {
             language = await select({
                 choices: [
@@ -101,7 +101,7 @@ export default class CreateFunction extends CreateCommand {
                 message: 'What language are you using?',
             });
         }
-        let trigger = params.trigger;
+        let { trigger } = params;
         if (!trigger) {
             trigger = await select({
                 choices: [
@@ -121,41 +121,41 @@ export default class CreateFunction extends CreateCommand {
                 message: 'How will your function be triggered?',
             });
         }
-        let events = params.events;
+        let { events } = params;
         if (trigger === 'model' && !events) {
             events = await input({
-                message: 'Enter event types separated by a comma',
                 default: 'product.created, etc...',
+                message: 'Enter event types separated by a comma',
             });
             if (events === 'product.created, etc...') {
                 events = '';
             }
         }
-        let schedule = params.schedule;
+        let { schedule } = params;
         if (trigger === 'cron' && !schedule) {
             schedule = await input({
-                message: 'Enter the crontab value',
                 default: '0 0 * * *',
+                message: 'Enter the crontab value',
             });
         }
-        let route = params.route;
+        let { route } = params;
         if (trigger === 'route' && !route) {
             route = await select({
-                message: 'Should tbe route be public (public_key) or private (secret_key)?',
                 choices: [
                     { name: 'Public', value: 'public' },
                     { name: 'Private', value: 'private' },
                 ],
+                message: 'Should tbe route be public (public_key) or private (secret_key)?',
             });
         }
-        let functionName = params.functionName;
+        let { functionName } = params;
         if (!functionName) {
             functionName = await input({
-                message: 'What will the endpoint be?',
                 default: functionName,
+                message: 'What will the endpoint be?',
             });
         }
-        let description = params.description;
+        const { description } = params;
         if (!description) {
             await input({
                 default: 'Does a thing when another other thing happens',
@@ -165,23 +165,23 @@ export default class CreateFunction extends CreateCommand {
         return {
             description,
             events: events || '',
-            route: route || '',
             functionName,
             language,
+            route: route || '',
             schedule: schedule || '',
             trigger,
         };
     }
-    async writeFunctionFile({ description, events, route, functionName, language, schedule, trigger, }, overwrite) {
+    async writeFunctionFile({ description, events, functionName, language, route, schedule, trigger, }, overwrite) {
         const fileName = toFunctionFileName(functionName);
         await this.createFile({
             extension: language,
             fileBody: getFunctionTemplate({
                 description,
                 events,
-                route,
                 functionName,
                 language,
+                route,
                 schedule,
                 trigger,
             }),

package/dist/commands/create/model.d.ts

@@ -7,10 +7,10 @@ export default class CreateModel extends CreateCollectionCommand {
         description: string;
     }[];
     static flags: {
-        label: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         description: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        fields: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         events: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        fields: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        label: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         overwrite: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     static summary: string;

package/dist/commands/create/model.js

@@ -25,25 +25,25 @@ export default class CreateModel extends CreateCollectionCommand {
         },
     ];
     static flags = {
-        label: Flags.string({
-            char: 'l',
-            default: '',
-            description: 'data model label, i.e. Products',
-        }),
         description: Flags.string({
             char: 'd',
             default: '',
             description: 'data model description',
         }),
+        events: Flags.string({
+            char: 'e',
+            default: 'created,updated,deleted',
+            description: 'list of data model events delimited by commas',
+        }),
         fields: Flags.string({
             char: 'f',
             default: '',
             description: 'list of data model fields delimited by commas',
         }),
-        events: Flags.string({
-            char: 'e',
-            default: 'created,updated,deleted',
-            description: 'list of data model events delimited by commas',
+        label: Flags.string({
+            char: 'l',
+            default: '',
+            description: 'data model label, i.e. Products',
         }),
         overwrite: Flags.boolean({
             default: false,
@@ -54,7 +54,7 @@ export default class CreateModel extends CreateCollectionCommand {
     createType = ConfigType.MODEL;
     async run() {
         const { flags } = await this.parse(CreateModel);
-        const { label, description, collection } = await this.promptCollection();
+        const { collection, description, label } = await this.promptCollection();
         const fileName = toFileName(collection);
         const fileBody = {
             collection,
@@ -70,12 +70,12 @@ export default class CreateModel extends CreateCollectionCommand {
         }
         else {
             const eventsInput = await checkbox({
-                message: 'Which events should be captured by default?',
                 choices: [
                     { name: 'created', value: 'created' },
                     { name: 'updated', value: 'updated' },
                     { name: 'deleted', value: 'deleted' },
                 ],
+                message: 'Which events should be captured by default?',
             });
             fileBody.events = parseEvents(eventsInput);
         }

package/dist/commands/create/notification.d.ts

@@ -11,12 +11,12 @@ export default class CreateNotification extends CreateCommand {
         description: string;
     }[];
     static flags: {
+        admin: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         description: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        subject: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         event: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        admin: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         once: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         overwrite: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        subject: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
     };
     static summary: string;
     createType: ConfigType;

package/dist/commands/create/notification.js

@@ -1,6 +1,6 @@
 import { input, select } from '@inquirer/prompts';
 import { Args, Flags } from '@oclif/core';
-import { singularize, capitalize } from 'inflection';
+import { capitalize, singularize } from 'inflection';
 import { CreateCommand } from '../../create-command.js';
 import { ConfigType } from '../../lib/apps/index.js';
 import { toFileName, toNotificationLabel } from '../../lib/create/index.js';
@@ -29,25 +29,20 @@ export default class CreateNotification extends CreateCommand {
         },
     ];
     static flags = {
+        admin: Flags.boolean({
+            char: 'a',
+            description: 'indicate when the notification is sent to store admins only',
+        }),
         description: Flags.string({
             char: 'd',
             default: '',
             description: 'notification description',
         }),
-        subject: Flags.string({
-            char: 's',
-            default: '',
-            description: 'notification email subject',
-        }),
         event: Flags.string({
             char: 'e',
             default: '',
             description: 'data model event to trigger the notification event, i.e. created',
         }),
-        admin: Flags.boolean({
-            char: 'a',
-            description: 'indicate when the notification is sent to store admins only',
-        }),
         once: Flags.boolean({
             char: 'o',
             description: 'indicate the notification should be sent only once when conditions are met, instead of repeating',
@@ -55,6 +50,11 @@ export default class CreateNotification extends CreateCommand {
         overwrite: Flags.boolean({
             description: 'overwrite existing notification configuration file',
         }),
+        subject: Flags.string({
+            char: 's',
+            default: '',
+            description: 'notification email subject',
+        }),
     };
     static summary = 'Initialize notification files and configuration with properties in the notifications folder.';
     createType = ConfigType.NOTIFICATION;
@@ -67,19 +67,19 @@ export default class CreateNotification extends CreateCommand {
                 event: flags.event,
                 model: args.model,
                 name: `${singularize(args.model)}-${args.name.replace(singularize(args.model), '')}`,
-                subject: flags.subject,
                 once: flags.once,
+                subject: flags.subject,
             }, false);
         }
         else {
-            let admin = flags.admin;
+            let { admin } = flags;
             if (admin === undefined) {
-                const choice = await await select({
-                    message: 'Who will be notified?',
+                const choice = await select({
                     choices: [
                         { name: 'Admins', value: 'admin' },
                         { name: 'Customers', value: 'customer' },
                     ],
+                    message: 'Who will be notified?',
                 });
                 if (choice === 'admin') {
                     admin = true;
@@ -87,35 +87,28 @@ export default class CreateNotification extends CreateCommand {
             }
             const collections = await this.getCollectionOptions();
             const model = await select({
+                choices: collections.map((collectionName) => ({
+                    name: collectionName,
+                    value: collectionName,
+                })),
+                loop: false,
                 message: 'Which model will trigger the notification?',
-                choices: [
-                    ...collections.map((collectionName) => ({
-                        name: collectionName,
-                        value: collectionName,
-                    })),
-                ],
                 pageSize: 25,
-                loop: false,
             });
             const event = await input({
-                message: 'Event to trigger the notification',
                 default: 'created',
+                message: 'Event to trigger the notification',
             });
             const answers = {
-                name: await input({
-                    message: 'Name of the notification',
-                    default: `${singularize(model)}-${event}`,
-                }),
-                subject: await input({
-                    message: 'Subject of the notification email',
-                    default: `Something happened with ${model}`,
-                }),
                 description: await input({
-                    message: 'Describe what the notification does',
                     default: `Notify ${admin ? 'admin' : 'customer'} when ${singularize(model)}...`,
+                    message: 'Describe what the notification does',
+                }),
+                name: await input({
+                    default: `${singularize(model)}-${event}`,
+                    message: 'Name of the notification',
                 }),
                 once: await select({
-                    message: 'When should we send this notification?',
                     choices: [
                         {
                             name: 'Every time conditions are met',
@@ -126,23 +119,28 @@ export default class CreateNotification extends CreateCommand {
                             value: true,
                         },
                     ],
+                    message: 'When should we send this notification?',
+                }),
+                subject: await input({
+                    default: `Something happened with ${model}`,
+                    message: 'Subject of the notification email',
                 }),
             };
-            const { description, name, subject, once } = answers;
-            await this.writeNotificationFile({ admin, description, event, model, name, subject, once }, false);
+            const { description, name, once, subject } = answers;
+            await this.writeNotificationFile({ admin, description, event, model, name, once, subject }, false);
         }
     }
-    async writeNotificationFile({ admin, description, event, model, name, subject, once, }, overwrite) {
+    async writeNotificationFile({ admin, description, event, model, name, once, subject, }, overwrite) {
         const label = [name].map((val) => capitalize(val).trim()).join(' ');
         const fileName = toFileName(label);
         const noteLabel = toNotificationLabel(name);
         const fileBody = {
             collection: model,
-            label: noteLabel,
-            subject: subject || `${noteLabel}...`,
-            event: event || 'created',
             conditions: {},
+            event: event || 'created',
+            label: noteLabel,
             method: 'email',
+            subject: subject || `${noteLabel}...`,
         };
         fileBody.description = description;
         if (admin) {

package/dist/commands/login.d.ts

@@ -3,8 +3,8 @@ import { SwellCommand } from '../swell-command.js';
 export default class Login extends SwellCommand {
     static description: string;
     static flags: {
-        store: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         force: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        store: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
     };
     static summary: string;
     constructor(argv: string[], config: Config);

package/dist/commands/login.js

@@ -11,14 +11,14 @@ Swell Admin login page, otherwise it will show you the stores you still
 have available for logging in to.
 `;
     static flags = {
-        store: Flags.string({
-            char: 's',
-            description: 'store to login to',
-        }),
         force: Flags.boolean({
             char: 'f',
             description: 'show all available stores and switch the current session if needed',
         }),
+        store: Flags.string({
+            char: 's',
+            description: 'store to login to',
+        }),
     };
     static summary = 'Login to your Swell user account.';
     constructor(argv, config) {
@@ -28,14 +28,14 @@ have available for logging in to.
     async run() {
         const { flags } = await this.parse(Login);
         const { force, store } = flags;
-        let currentStoreId = config.getDefaultStore();
+        const currentStoreId = config.getDefaultStore();
         let user;
         if (currentStoreId && !force) {
             try {
                 user = await this.api.get({ adminPath: 'user' });
                 config.setUser(user);
             }
-            catch (err) {
+            catch {
                 // noop
             }
         }
@@ -46,6 +46,7 @@ have available for logging in to.
         await modifyDefaultStore({ currentStoreId, storeId });
         config.setUser(user);
         this.log(`You are now logged in to ${style.storeId(storeId)} as ${style.currentUser(user.username)}.`);
+        // eslint-disable-next-line no-process-exit, unicorn/no-process-exit
         process.env.NODE_ENV !== 'test' && process.exit(0);
     }
     /**

package/dist/commands/logs.js

@@ -51,10 +51,12 @@ function buildLogRequestBody(flags) {
     }
     const { after, before, env, startPolling } = flags;
     if (env) {
+        // eslint-disable-next-line camelcase
         andConditions.push({ environment_id: env });
     }
     else {
         // Default to test env
+        // eslint-disable-next-line camelcase
         andConditions.push({ environment_id: 'test' });
     }
     // if we are polling, we want to get logs after the last date we received

package/dist/create-collection-command.d.ts

@@ -7,20 +7,20 @@ import { CreateCommand } from './create-command.js';
  * - promptCollection: Get collection name and description
  */
 export declare abstract class CreateCollectionCommand extends CreateCommand {
-    static baseFlags: {
-        'app-path': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-    };
     static args: {
         collection: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
     };
+    static baseFlags: {
+        'app-path': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+    };
     static flags: {
-        label: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         description: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        label: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         overwrite: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     promptCollection(): Promise<{
-        label: string;
-        description: string;
         collection: string;
+        description: string;
+        label: string;
     }>;
 }

package/dist/create-collection-command.js

@@ -1,7 +1,7 @@
-import { input, select, Separator } from '@inquirer/prompts';
+import { Separator, input, select } from '@inquirer/prompts';
 import { Args, Flags } from '@oclif/core';
 import { CreateCommand } from './create-command.js';
-import { toCollectionName, toCollectionLabel } from './lib/create/index.js';
+import { toCollectionLabel, toCollectionName } from './lib/create/index.js';
 /**
  * A base class for Swell CLI Create [content|models] command input.
  *
@@ -11,29 +11,29 @@ import { toCollectionName, toCollectionLabel } from './lib/create/index.js';
  */
 export class CreateCollectionCommand extends CreateCommand {
     // base flags for all AppCommands
+    static args = {
+        collection: Args.string({
+            default: '',
+            description: 'collection to create or apply to, i.e. products',
+        }),
+    };
     // needs to be in a ES2021 format: https://github.com/oclif/oclif/issues/1100
     static baseFlags = {
         'app-path': Flags.string({
             description: 'path to the app directory',
         }),
     };
-    static args = {
-        collection: Args.string({
+    static flags = {
+        description: Flags.string({
+            char: 'd',
             default: '',
-            description: 'collection to create or apply to, i.e. products',
+            description: 'the collection description',
         }),
-    };
-    static flags = {
         label: Flags.string({
             char: 'l',
             default: '',
             description: 'the collection label',
         }),
-        description: Flags.string({
-            char: 'd',
-            default: '',
-            description: 'the collection description',
-        }),
         overwrite: Flags.boolean({
             char: 'o',
             default: false,
@@ -42,14 +42,13 @@ export class CreateCollectionCommand extends CreateCommand {
     };
     async promptCollection() {
         const { args, flags } = await this.parse(CreateCollectionCommand);
-        let { label, description } = flags;
+        let { description, label } = flags;
         let { collection } = args;
         let isStandardCollection = false;
         let collectionInput = collection;
         if (!collection) {
             const collections = await this.getCollectionOptions();
             collectionInput = await select({
-                message: 'Where will content be stored?',
                 choices: [
                     { name: 'Create a new collection', value: '' },
                     new Separator(),
@@ -58,6 +57,7 @@ export class CreateCollectionCommand extends CreateCommand {
                         value: collectionName,
                     })),
                 ],
+                message: 'Where will content be stored?',
                 pageSize: 25,
             });
             if (collectionInput) {
@@ -65,8 +65,8 @@ export class CreateCollectionCommand extends CreateCommand {
             }
             else {
                 collectionInput = await input({
-                    message: 'Collection name',
                     default: 'special-things',
+                    message: 'Collection name',
                 });
             }
             // we replace unwanted characters with underscores to make things easier
@@ -75,23 +75,23 @@ export class CreateCollectionCommand extends CreateCommand {
         }
         if (!label && !isStandardCollection) {
             label = await input({
-                message: 'Collection label',
                 default: toCollectionLabel(collection),
+                message: 'Collection label',
             });
             label = toCollectionLabel(label);
         }
         description =
             description ||
                 (await input({
+                    default: 'Special things for special people',
                     message: isStandardCollection
                         ? `Describe the purpose of fields being added to ${collection}`
                         : 'Describe what this collection is for',
-                    default: 'Special things for special people',
                 }));
         return {
-            label,
-            description,
             collection,
+            description,
+            label,
         };
     }
 }