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

package/dist/commands/app/push.js

@@ -50,7 +50,10 @@ ${Object.values(ConfigPaths)
         const file = fileArg || fileFlag;
         const currentStore = swellConfig.getDefaultStore();
         this.api.setStoreEnv(currentStore, 'test');
-        this.app = await this.getAppWithConfig('', false);
+        this.app = await this.getAppWithConfig('').catch((_err) => {
+            // Ignore so we can continue to create it
+            return {};
+        });
         const confirmExistingApp = await this.confirmRemoveInstalledApp(currentStore);
         if (confirmExistingApp === false) {
             return;
@@ -60,9 +63,7 @@ ${Object.values(ConfigPaths)
             if (!confirmExistingApp?.id) {
                 const otherAppName = this.app.name || this.appConfig.get('name');
                 const confirmPushNew = await confirm({
-                    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)}?`,
+                    message: `${style.appConfigValue(otherAppName)} has a dev version in another environment. Do you want to create a new development instance in ${style.storeId(currentStore)}?`,
                     default: false,
                 });
                 if (!confirmPushNew) {

package/dist/commands/login.js

@@ -39,21 +39,14 @@ have available for logging in to.
                 // noop
             }
         }
-        if (!user) {
-            const [sessionId, storeId] = await getSessionIdOrLoginInBrowser(store);
-            this.api.setStoreEnv(storeId);
-            user = await this.api.get({ adminPath: 'user' }, { sessionId });
-            await this.getAndSetStoreConfig({ sessionId, storeId });
-            await modifyDefaultStore({ currentStoreId, storeId });
-            config.setUser(user);
-            this.log(`You are now logged in to ${style.storeId(storeId)} as ${style.currentUser(user.username)}.`);
-            process.exit(0);
-        }
-        this.log(`You are already logged in as ${style.currentUser(user.username)}.`);
-        this.log([
-            `Use ${style.command('swell switch')}`,
-            'to login to another account.',
-        ].join(' '));
+        const [sessionId, storeId] = await getSessionIdOrLoginInBrowser(store);
+        this.api.setStoreEnv(storeId);
+        user = await this.api.get({ adminPath: 'user' }, { sessionId });
+        await this.getAndSetStoreConfig({ sessionId, storeId });
+        await modifyDefaultStore({ currentStoreId, storeId });
+        config.setUser(user);
+        this.log(`You are now logged in to ${style.storeId(storeId)} as ${style.currentUser(user.username)}.`);
+        process.env.NODE_ENV !== 'test' && process.exit(0);
     }
     /**
      * Use the /user/switch API request to either get the session id for the

package/dist/lib/bundle.js

@@ -28,7 +28,7 @@ export async function bundleFunction(filePath) {
         // eslint-disable-next-line no-new-func
         const evalFn = new Function(`${code}\nreturn { ...moduleExports }`);
         const { config, ...moduleExports } = evalFn();
-        code += getSwellFunctionWrapper();
+        code = await minifyCode(code + getSwellFunctionWrapper());
         return { code, config, dependencies, moduleExports };
     }
     catch (error) {
@@ -41,3 +41,16 @@ function getSwellFunctionWrapper() {
     const __dirname = path.dirname(__filename);
     return fs.readFileSync(path.join(__dirname, './swell-function-wrapper.js'), 'utf8');
 }
+async function minifyCode(code) {
+    try {
+        const result = await esbuild.transform(code, {
+            minifyWhitespace: true,
+            minifyIdentifiers: false,
+            minifySyntax: false,
+        });
+        return result.code;
+    }
+    catch (err) {
+        throw new Error('Compilation error:', err.message);
+    }
+}

package/dist/lib/logs/index.js

@@ -83,6 +83,6 @@ export class LoggedItem {
             }
         })
             .join('\n');
-        return `Function ${event ? `${event.type} >` : ''} ${style.logMethod(method.toUpperCase())} /${name} ${logLines ? `\n${logLines}` : ''}`;
+        return `Function ${event ? `${event.hook ? `${event.hook}:` : ''}${event.type} >` : ''} ${style.logMethod(method.toUpperCase())} /${name} ${logLines ? `\n${logLines}` : ''}`;
     }
 }

package/dist/lib/swell-function-wrapper.d.ts

@@ -1,4 +1,11 @@
-declare function handleRequest(originalRequest: any, _env: any, context: any): Promise<Response>;
+/**
+ * Handle a function request.
+ * @param {Request} originalRequest from cloudflare
+ * @param {*} _env cloudflare environment vars
+ * @param {*} context cloudflare conttext
+ * @returns {Promise<SwellResponse>}
+ */
+declare function request(originalRequest: Request, _env: any, context: any): Promise<SwellResponse>;
 /**
  * Invokes one of the function types that are available.
  *
@@ -35,10 +42,19 @@ declare function handleRequest(originalRequest: any, _env: any, context: any): P
  * @param {Event} context
  */
 declare function executeModuleHandler(req: SwellRequest, context: Event): Promise<any>;
+/**
+ * Helper to determine if a value is an ordinary object.
+ * @param {any} obj
+ * @returns {boolean}
+ */
+declare function isOrdinaryObject(val: any): boolean;
 declare const origialConsoleLog: {
     (...data: any[]): void;
     (message?: any, ...optionalParams: any[]): void;
 };
+/**
+ * Class representing a Swell request.
+ */
 declare class SwellRequest {
     constructor(req: any, context: any);
     originalRequest: any;
@@ -62,8 +78,21 @@ declare class SwellRequest {
     url: URL | undefined;
     parseJson(input: any): any;
     log(level: any, ...line: any[]): void;
+    getIngestableLogs(response: any): {
+        params: any;
+    } | undefined;
     ingestLogs(response: any): Promise<void>;
+    /**
+     * Merge values into app data for the current request.
+     * @param {object|string|undefined} idOrValues string to indicate app ID, or values to merge
+     * @param {object|undefined} values values to merge into app data
+     * @returns {object|undefined} existing app data merged with values if passed
+     */
+    appValues(idOrValues?: object | string | undefined, values?: object | undefined): object | undefined;
 }
+/**
+ * Class representing the Swell backend API.
+ */
 declare class SwellAPI {
     constructor(req: any, context: any);
     request: any;
@@ -79,10 +108,20 @@ declare class SwellAPI {
     delete(url: any, data: any): Promise<any>;
     settings(id?: any): Promise<any>;
 }
+/**
+ * Class representing a Swell error.
+ */
 declare class SwellError extends Error {
     constructor(message: any, options?: {});
     status: any;
 }
+/**
+ * Class representing a Swell response.
+ */
 declare class SwellResponse extends Response {
+    static _respond(req: any, response: any, context: any): any;
+    static _respondWithLogs(response: any, req: any): SwellResponse;
     constructor(data: any, options?: {});
+    _swellData: any;
+    _swellOptions: {};
 }

package/dist/lib/swell-function-wrapper.js

@@ -1,9 +1,16 @@
 "use strict";
 const origialConsoleLog = console.log;
 addEventListener('fetch', (event) => {
-    event.respondWith(handleRequest(event.request, event.env, event));
+    event.respondWith(request(event.request, event.env, event));
 });
-async function handleRequest(originalRequest, _env, context) {
+/**
+ * Handle a function request.
+ * @param {Request} originalRequest from cloudflare
+ * @param {*} _env cloudflare environment vars
+ * @param {*} context cloudflare conttext
+ * @returns {Promise<SwellResponse>}
+ */
+async function request(originalRequest, _env, context) {
     const req = new SwellRequest(originalRequest, context);
     await req.initialize();
     let response;
@@ -12,16 +19,10 @@ async function handleRequest(originalRequest, _env, context) {
     }
     catch (err) {
         // Log the error for Swell
-        console.error(err.stack);
+        console.error(err);
         response = new SwellResponse({ error: err.message }, { status: err.status || 500 });
     }
-    // Create a response by default if one is not returned
-    if (!(response instanceof Response)) {
-        response = new SwellResponse(response);
-    }
-    // Send logs back to Swell
-    context.waitUntil(req.ingestLogs(response));
-    return response;
+    return SwellResponse._respond(req, response, context);
 }
 /**
  * Invokes one of the function types that are available.
@@ -74,6 +75,9 @@ async function executeModuleHandler(req, context) {
     }
     throw new Error(`Function does not export a method to handle ${method.toUpperCase()} requests`);
 }
+/**
+ * Class representing a Swell request.
+ */
 class SwellRequest {
     constructor(req, context) {
         this.originalRequest = req;
@@ -141,11 +145,11 @@ class SwellRequest {
         origialConsoleLog(...line);
         this._logs.push({
             date: Date.now(),
-            line: line.map((l) => JSON.stringify(l)),
+            line: line.map((l) => (l instanceof Error ? l.stack : JSON.stringify(l))),
             ...(level !== 'info' ? { level } : {}),
         });
     }
-    async ingestLogs(response) {
+    getIngestableLogs(response) {
         if (!this.logParams) {
             return;
         }
@@ -153,23 +157,51 @@ class SwellRequest {
             this.logParams.time = Date.now() - this.logParams.$start;
             delete this.logParams.$start;
         }
-        const result = await this.swell.post('/:logs', {
-            $ingest_function_logs: {
-                params: {
-                    ...this.logParams,
-                    message: {
-                        ...this.logParams?.message,
-                        logs: this._logs,
-                        status: response.status,
-                    },
+        return {
+            params: {
+                ...this.logParams,
+                message: {
+                    ...this.logParams?.message,
+                    logs: this._logs,
+                    status: response.status,
                 },
             },
+        };
+    }
+    async ingestLogs(response) {
+        const ingestableLogs = this.getIngestableLogs(response);
+        if (!ingestableLogs) {
+            return;
+        }
+        const result = await this.swell.post('/:logs', {
+            $ingest_function_logs: ingestableLogs,
         });
         if (!result?.success) {
             console.error('Error ingesting logs', result);
         }
     }
+    /**
+     * Merge values into app data for the current request.
+     * @param {object|string|undefined} idOrValues string to indicate app ID, or values to merge
+     * @param {object|undefined} values values to merge into app data
+     * @returns {object|undefined} existing app data merged with values if passed
+     */
+    appValues(idOrValues = undefined, values = undefined) {
+        const appId = typeof idOrValues === 'string' ? appIdOrValues : this.appId;
+        const appValues = typeof idOrValues === 'string' ? values : idOrValues;
+        if (!appId || !isOrdinaryObject(appValues)) {
+            return undefined;
+        }
+        return {
+            $app: {
+                [appId]: appValues,
+            },
+        };
+    }
 }
+/**
+ * Class representing the Swell backend API.
+ */
 class SwellAPI {
     constructor(req, context) {
         this.request = req;
@@ -261,6 +293,9 @@ class SwellAPI {
         return this.makeRequest('GET', `/settings/${id}`);
     }
 }
+/**
+ * Class representing a Swell error.
+ */
 class SwellError extends Error {
     constructor(message, options = {}) {
         let formattedMessage;
@@ -278,10 +313,13 @@ class SwellError extends Error {
         this.status = options.status || 500;
     }
 }
+/**
+ * Class representing a Swell response.
+ */
 class SwellResponse extends Response {
     constructor(data, options = {}) {
         const resultHeaders = {};
-        let result;
+        let result = '';
         if (typeof data === 'string') {
             result = data;
             resultHeaders['Content-Type'] = 'text/plain;charset=UTF-8';
@@ -298,5 +336,52 @@ class SwellResponse extends Response {
                 ...(options.headers || {}),
             },
         });
+        // Saved for future access
+        this._swellData = data;
+        this._swellOptions = options || {};
     }
+    static _respond(req, response, context) {
+        let finalResponse = response;
+        // Convert a plain Response instance to SwellResponse
+        if (finalResponse instanceof Response &&
+            !(finalResponse instanceof SwellResponse)) {
+            finalResponse = new SwellResponse(response.body, {
+                status: response.status,
+                headers: response.headers,
+            });
+        }
+        else if (!(finalResponse instanceof SwellResponse)) {
+            finalResponse = new SwellResponse(response);
+        }
+        // Send logs back with the response for event hooks
+        if (req.data?.$event?.hook) {
+            return SwellResponse._respondWithLogs(finalResponse, req);
+        }
+        // Ingest logs in the background
+        context.waitUntil(req.ingestLogs(finalResponse));
+        return finalResponse;
+    }
+    static _respondWithLogs(response, req) {
+        const ingestableLogs = req.getIngestableLogs(response);
+        // Rebuild response with logs
+        const responseData = response instanceof SwellResponse ? response?._swellData : response;
+        const resultData = ingestableLogs
+            ? {
+                $logs: ingestableLogs,
+                $data: responseData,
+            }
+            : responseData;
+        return new SwellResponse(resultData, response?._swellOptions);
+    }
+}
+/**
+ * Helper to determine if a value is an ordinary object.
+ * @param {any} obj
+ * @returns {boolean}
+ */
+function isOrdinaryObject(val) {
+    return (typeof val === 'object' &&
+        val !== null &&
+        Object.getPrototypeOf(val) === Object.prototype);
 }
+;

package/dist/remote-app-command.d.ts

@@ -12,7 +12,7 @@ export declare abstract class RemoteAppCommand extends AppCommand {
     }, storeId?: string): string;
     protected deleteConfig(configId: string): Promise<any>;
     protected getApp(id?: string): Promise<App>;
-    protected getAppWithConfig(id?: string, errorNotFound?: boolean): Promise<App>;
+    protected getAppWithConfig(id?: string): Promise<App>;
     protected getCreateUpdateApp(updateApp?: App): Promise<App>;
     protected handleRequestErrors(request: () => any, spinnerError?: () => void): Promise<any>;
     init(): Promise<void>;

package/dist/remote-app-command.js

@@ -51,7 +51,7 @@ export class RemoteAppCommand extends AppCommand {
         this.debugJson('getApp: remote app', app);
         return app;
     }
-    async getAppWithConfig(id = '', errorNotFound = true) {
+    async getAppWithConfig(id = '') {
         const swellId = this.app?.id;
         const appConfigId = this.appConfig.get('id');
         if (!appConfigId) {
@@ -90,7 +90,7 @@ export class RemoteAppCommand extends AppCommand {
             // we don't create a loop.
             //
             // we don't throw an error ever sometimes, like when pushing an app
-            const shouldThrow = !errorNotFound && (errorJson.error.message !== 'App not found' || id);
+            const shouldThrow = errorJson.error.message !== 'App not found' || id;
             if (shouldThrow) {
                 const errorMessage = typeof errorJson.error === 'string'
                     ? errorJson.error
@@ -201,6 +201,10 @@ export class RemoteAppCommand extends AppCommand {
                 this.showErrors(jsonError, spinnerError);
                 this.error('API request failed');
             }
+            else if (typeof error.message === 'string') {
+                this.showErrors(error, spinnerError);
+                this.error(error.message);
+            }
             throw error;
         }
     }

package/oclif.manifest.json

@@ -1086,5 +1086,5 @@
       ]
     }
   },
-  "version": "2.0.1-alpha.11"
+  "version": "2.0.1-alpha.13"
 }

package/package.json

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