@swell/cli 2.0.16 → 2.0.18

package/dist/commands/app/version.js

@@ -79,9 +79,9 @@ behavior by using the --no-git-tag option.`;
         if (!(await this.ensureAppExists(undefined, false))) {
             return;
         }
-        const remoteVersion = this.app.version;
+        const localVersion = this.app.version;
         if (amend) {
-            const amendVersion = nextVersion || remoteVersion;
+            const amendVersion = nextVersion || localVersion;
             const appVersion = await this.getVersion(amendVersion);
             if (appVersion) {
                 await this.updateVersion(amendVersion, {
@@ -93,21 +93,26 @@ behavior by using the --no-git-tag option.`;
             }
             return;
         }
+        const latestVersion = await this.getVersion();
+        const remoteVersion = latestVersion?.version;
+        // Suggest the next version if not provided
+        if (!nextVersion && semver.gt(localVersion, remoteVersion)) {
+            nextVersion = localVersion;
+        }
         // If the user didn't specify a version, show the latest one
         if (!nextVersion) {
-            const latestVersion = await this.getVersion();
-            if (latestVersion) {
-                this.log(`${style.appConfigValue(this.app.name)} latest remote version is ${style.appConfigValue(latestVersion.version)}.`);
+            if (remoteVersion) {
+                this.log(`${style.appConfigValue(this.app.name)} latest remote version is ${style.appConfigValue(remoteVersion)}.`);
             }
             else {
-                nextVersion = remoteVersion;
+                nextVersion = localVersion;
                 if (!nextVersion) {
                     this.error(`${style.appConfigValue(this.app.name)} has not been versioned yet.`);
                 }
             }
             return;
         }
-        nextVersion = this.validateAndComputeVersion(nextVersion, remoteVersion);
+        nextVersion = this.validateAndComputeVersion(nextVersion, localVersion);
         await this.pushAppConfigs();
         await this.deployAppFrontend(false, false);
         if (!message) {
@@ -175,15 +180,15 @@ behavior by using the --no-git-tag option.`;
         // tag the version in git
         await git.spawn(['tag', tag], { cwd: process.cwd() });
     }
-    validateAndComputeVersion(nextVersion, remoteVersion) {
+    validateAndComputeVersion(nextVersion, localVersion) {
         let version = nextVersion;
         // compute the value of the next version and check if it's valid
         if (RELEASE_TYPES.includes(nextVersion)) {
             // increment the version
-            version = semver.inc(remoteVersion, version);
+            version = semver.inc(localVersion, version);
         }
-        if (semver.lt(version, remoteVersion)) {
-            this.error(`Version ${version} must be greater than the current version ${remoteVersion}.`);
+        if (semver.lt(version, localVersion)) {
+            this.error(`Version ${version} must be greater than the current version ${localVersion}.`);
         }
         return version;
     }

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

@@ -12,7 +12,7 @@ export default class CreateApp extends CreateAppCommand {
     static flags: any;
     createSwellConfig({ allowOverwrite, inputId, inputStorefrontApp, inputType, inputYes, nestedPath, }: {
         allowOverwrite?: boolean;
-        inputId: string;
+        inputId?: string;
         inputStorefrontApp?: string;
         inputType?: string;
         inputYes?: boolean;

package/dist/commands/create/app.js

@@ -46,7 +46,7 @@ export default class CreateApp extends CreateAppCommand {
             options: ['admin', 'integration', 'storefront', 'theme'],
         }),
     };
-    async createSwellConfig({ allowOverwrite = true, inputId, inputStorefrontApp, inputType, inputYes, nestedPath = true, }) {
+    async createSwellConfig({ allowOverwrite = true, inputId = '', inputStorefrontApp, inputType, inputYes, nestedPath = true, }) {
         let confirmYes = inputYes;
         const type = inputType ||
             (confirmYes
@@ -138,7 +138,7 @@ export default class CreateApp extends CreateAppCommand {
                     permissions: [],
                 }),
         };
-        const appPath = path.join(process.cwd(), appId);
+        const appPath = path.join(process.cwd(), inputId || appId);
         if (swellConfigFileExists(appPath)) {
             if (allowOverwrite) {
                 if (!confirmYes) {
@@ -164,7 +164,7 @@ export default class CreateApp extends CreateAppCommand {
         if (!confirmCreateApp) {
             return;
         }
-        const config = newConfig(nestedPath ? appId : '');
+        const config = newConfig(nestedPath ? inputId || appId : '');
         config.clear();
         config.set(swellConfigJson);
         return { appId, config, installedStorefrontApp, swellConfigJson };

package/dist/commands/create/function.js

@@ -106,15 +106,15 @@ export default class CreateFunction extends CreateConfigCommand {
             trigger = await select({
                 choices: [
                     {
-                        name: 'Event',
+                        name: 'Event (model)',
                         value: 'model',
                     },
                     {
-                        name: 'Schedule',
+                        name: 'Schedule (cron)',
                         value: 'cron',
                     },
                     {
-                        name: 'HTTP',
+                        name: 'HTTP (route)',
                         value: 'route',
                     },
                 ],
@@ -125,7 +125,7 @@ export default class CreateFunction extends CreateConfigCommand {
         if (trigger === 'model' && !events) {
             events = await input({
                 default: 'product.created, etc...',
-                message: 'Enter event types separated by a comma',
+                message: 'Enter event types to trigger this function (comma separated)',
             });
             if (events === 'product.created, etc...') {
                 events = '';
@@ -135,7 +135,7 @@ export default class CreateFunction extends CreateConfigCommand {
         if (trigger === 'cron' && !schedule) {
             schedule = await input({
                 default: '0 0 * * *',
-                message: 'Enter the crontab value',
+                message: 'Enter a crontab value',
             });
         }
         let { route } = params;
@@ -145,14 +145,14 @@ export default class CreateFunction extends CreateConfigCommand {
                     { name: 'Public', value: 'public' },
                     { name: 'Private', value: 'private' },
                 ],
-                message: 'Should tbe route be public (public_key) or private (secret_key)?',
+                message: 'Should the HTTP route be public (using public_key) or private (using secret_key)?',
             });
         }
         let { functionName } = params;
         if (!functionName) {
             functionName = await input({
                 default: functionName,
-                message: 'What will the endpoint be?',
+                message: 'Name your function',
             });
         }
         const { description } = params;

package/dist/create-app-command.js

@@ -53,14 +53,14 @@ export class CreateAppCommand extends SwellCommand {
                         ? []
                         : [
                             {
-                                name: 'Do not install a starter framework',
+                                name: 'Do not install a frontend framework',
                                 value: null,
                             },
                         ]),
                 ],
                 message: directCreate
-                    ? `Choose a framework for your hosted${kind ? ` ${kind} ` : ' '}app frontend`
-                    : `Install a framework for your hosted${kind ? ` ${kind} ` : ' '}app frontend?`,
+                    ? `Choose framework for your hosted${kind ? ` ${kind} ` : ' '}app frontend`
+                    : `Install framework for a hosted${kind ? ` ${kind} ` : ' '}app frontend?`,
             }));
         if (frameworkType) {
             const projectType = FrontendProjectTypes.find((type) => type.slug === frameworkType);

package/oclif.manifest.json

@@ -1891,5 +1891,5 @@
       ]
     }
   },
-  "version": "2.0.16"
+  "version": "2.0.18"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swell/cli",
-  "version": "2.0.16",
+  "version": "2.0.18",
   "type": "module",
   "description": "Swell's command line interface/utility",
   "keywords": [