@swell/cli 2.0.1-alpha.3 → 2.0.1-alpha.5

package/dist/commands/app/_pull.js

@@ -1,9 +1,9 @@
 import { Args } from '@oclif/core';
 import { dasherize, pluralize, underscore } from 'inflection';
-import snakeCase from 'lodash/snakeCase.js';
 import * as path from 'node:path';
 import { newConfig } from '../../lib/app-config.js';
 import { ConfigPaths, writeJsonFile, } from '../../lib/apps/index.js';
+import { toAppId } from '../../lib/create/index.js';
 import style from '../../lib/style.js';
 import { RemoteAppCommand } from '../../remote-app-command.js';
 export default class AppPull extends RemoteAppCommand {
@@ -25,7 +25,7 @@ export default class AppPull extends RemoteAppCommand {
         const config = newConfig();
         const appConfigJson = {
             description: this.app.description || '',
-            id: snakeCase(this.app.name),
+            id: toAppId(this.app.name),
             name: this.app.name,
             version: this.app.version,
         };

package/dist/commands/app/push.js

@@ -41,16 +41,19 @@ ${Object.values(ConfigPaths)
         const { file } = flags;
         const currentStore = swellConfig.getDefaultStore();
         this.api.setStoreEnv(currentStore, 'test');
-        this.app = await this.getAppWithConfig(undefined, false);
+        this.app = await this.getAppWithConfig('', false);
         const confirmExistingApp = await this.confirmRemoveInstalledApp(currentStore);
         if (confirmExistingApp === false) {
             return;
         }
         // If app exists but owned by another client, offer to create a new instance
-        if (this.app.client_id !== currentStore) {
+        if (this.app.client_id && this.app.client_id !== currentStore) {
             if (!confirmExistingApp?.id) {
+                const otherAppName = this.app.name || this.appConfig.get('name');
                 const confirmPushNew = await confirm({
-                    message: `${style.appConfigValue(this.app.name)} has a dev version in another store (${style.storeId(this.app.client_id)}). Do you want to create a new development instance in ${style.storeId(currentStore)}?`,
+                    message: `${style.appConfigValue(otherAppName)} has a dev version in another ${this.app.client_id
+                        ? `store ${style.dim(`(${this.app.client_id})`)}`
+                        : 'environment'}. Do you want to create a new development instance in ${style.storeId(currentStore)}?`,
                     default: false,
                 });
                 if (!confirmPushNew) {

package/dist/lib/create/index.d.ts

@@ -5,7 +5,7 @@ interface CreateFileParams {
 }
 declare const toFileName: (value: string) => string;
 declare const toAppName: (value: string) => string;
-declare const toAppId: (value: string) => string;
+declare const toAppId: (value: string | undefined) => string;
 declare const toFunctionFileName: (value: string) => string;
 declare const toCollectionName: (value: string) => string;
 declare const toCollectionLabel: (value: string) => string;

package/dist/lib/create/index.js

@@ -4,9 +4,11 @@ const toFileName = (value) => dasherize(underscore(value.split('.')[0].replace('
 // Example: 'my-things' => 'My Things'
 const toAppName = (value) => pluralize(titleize(value).replace('-', ' '));
 // Example: 'My App' => 'my_app'
-const toAppId = (value) => value
-    .replace(/[^a-z0-9]+/gi, '_')
-    .replace(/^\_|\_$/g, '')
+const toAppId = (value) => String(value || '')
+    .replace(/[^a-zA-Z0-9\-_\s:\.\/]/g, '')
+    .replace(/[_\s-:\.\/]+/g, '_')
+    .replace(/^[_]+|[_]+$/g, '')
+    .replace(/([a-z])([A-Z])/g, '$1_$2')
     .toLowerCase();
 // Example: 'My Thing' => 'my-thing'
 // And: 'myThing' => 'myThing'

package/dist/remote-app-command.js

@@ -1,11 +1,11 @@
 import { inflect } from 'inflection';
-import snakeCase from 'lodash/snakeCase.js';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import ora from 'ora';
 import { AppCommand } from './app-command.js';
 import { appConfigFileExists, readRcFile, writeRcFile, } from './lib/app-config.js';
 import { FunctionProcessingError, IgnoringFileError, allConfigFilesPaths, appConfigFromFile, appLogoIcon, batchAppConfigsByType, configFilePath, isAppLogoIcon, } from './lib/apps/index.js';
+import { toAppId } from './lib/create/index.js';
 import { default as swellConfig } from './lib/config.js';
 import { getLoginHost } from './lib/constants.js';
 import style from './lib/style.js';
@@ -64,7 +64,7 @@ export class RemoteAppCommand extends AppCommand {
                 this.error(`App ${style.appConfigName('id')} is not defined in swell.json.`);
             }
             if (privateId !== appConfigId) {
-                this.error(`App ${style.appConfigName('id')} must be defined in snake_case: ${style.appConfigValue(appConfigId)}.`);
+                this.error(`App ${style.appConfigName('id')} must be declared in snake_case: ${style.appConfigValue(appConfigId)}.`);
             }
             appId = privateId;
         }
@@ -97,7 +97,7 @@ export class RemoteAppCommand extends AppCommand {
                     : errorJson.error.message;
                 this.error(errorMessage);
             }
-            if (swellId) {
+            if (swellId && swellId !== id && swellId !== this.app?.id) {
                 app = await this.getAppWithConfig(swellId);
             }
         }
@@ -113,7 +113,9 @@ export class RemoteAppCommand extends AppCommand {
             // when posting to the API
             id: undefined,
             logo_icon: null,
-            private_id: this.app?.private_id,
+            ...(this.appConfig.store.id
+                ? { private_id: this.appConfig.store.id }
+                : undefined),
             ...(remoteApp?.id ? { source_id: remoteApp.id } : undefined),
         };
         const logoIcon = appLogoIcon(this.appPath);
@@ -126,9 +128,15 @@ export class RemoteAppCommand extends AppCommand {
         let appCreated = false;
         if (!app.id) {
             // May already have a dev instance
-            const existingDevApp = await this.api.get({
-                adminPath: `/apps/${this.app?.private_id}`,
-            });
+            let existingDevApp;
+            try {
+                existingDevApp = await this.api.get({
+                    adminPath: `/apps/${this.appConfig.store.id}`,
+                });
+            }
+            catch (err) {
+                // noop
+            }
             spinner.start(`Creating app...`);
             if (existingDevApp) {
                 app = await this.handleRequestErrors(async () => this.api.put({ adminPath: `/apps/${existingDevApp.id}` }, { body }), () => spinner.fail('Error creating app'));
@@ -327,8 +335,9 @@ export class RemoteAppCommand extends AppCommand {
             }
         }
         if (this.appConfig.get('id')) {
+            // use the same formula as the backend api
             // eslint-disable-next-line camelcase
-            remoteApp.private_id = snakeCase(this.appConfig.get('id'));
+            remoteApp.private_id = toAppId(this.appConfig.get('id'));
         }
         return remoteApp;
     }

package/oclif.manifest.json

@@ -1081,5 +1081,5 @@
       ]
     }
   },
-  "version": "2.0.1-alpha.3"
+  "version": "2.0.1-alpha.5"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swell/cli",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.5",
   "type": "module",
   "description": "Swell's command line interface/utility",
   "keywords": [