@friggframework/devtools 2.0.0--canary.517.179491e.0 → 2.0.0--canary.522.893db5d.0

package/frigg-cli/install-command/environment-variables.js

@@ -1,9 +1,8 @@
 const fs = require('fs');
 const dotenv = require('dotenv');
 const { readFileSync, writeFileSync, existsSync } = require('fs');
-const { logInfo } = require('./logger');
+const output = require('../utils/output');
 const { resolve } = require('node:path');
-const { confirm, input } = require('@inquirer/prompts');
 const { parse } = require('@babel/parser');
 const traverse = require('@babel/traverse').default;
 
@@ -43,15 +42,14 @@ const extractRawEnvVariables = (modulePath) => {
     return envVariables;
 };
 const handleEnvVariables = async (backendPath, modulePath) => {
-    logInfo('Searching for missing environment variables...');
+    output.info('Searching for missing environment variables...');
     const Definition = { env: extractRawEnvVariables(modulePath) };
     if (Definition && Definition.env) {
-        console.log('Here is Definition.env:', Definition.env);
+        output.debug('Definition.env:', JSON.stringify(Definition.env));
         const envVars = Object.values(Definition.env);
 
-        console.log(
-            'Found the following environment variables in the API module:',
-            envVars
+        output.info(
+            `Found environment variables in API module: ${envVars.join(', ')}`
         );
 
         const localEnvPath = resolve(backendPath, '../.env');
@@ -78,23 +76,19 @@ const handleEnvVariables = async (backendPath, modulePath) => {
             (envVar) => !localEnvVars[envVar] && !localDevConfig[envVar]
         );
 
-        logInfo(`Missing environment variables: ${missingEnvVars.join(', ')}`);
-
         if (missingEnvVars.length > 0) {
-            const addEnvVars = await confirm({
-                message: `The following environment variables are required: ${missingEnvVars.join(
+            output.warn(`Missing environment variables: ${missingEnvVars.join(', ')}`);
+
+            const addEnvVars = await output.confirm(
+                `The following environment variables are required: ${missingEnvVars.join(
                     ', '
-                )}. Do you want to add them now?`,
-            });
+                )}. Do you want to add them now?`
+            );
 
             if (addEnvVars) {
                 const envValues = {};
                 for (const envVar of missingEnvVars) {
-                    const value = await input({
-                        type: 'input',
-                        name: 'value',
-                        message: `Enter value for ${envVar}:`,
-                    });
+                    const value = await output.input(`Enter value for ${envVar}:`);
                     envValues[envVar] = value;
                 }
 
@@ -117,9 +111,12 @@ const handleEnvVariables = async (backendPath, modulePath) => {
                         JSON.stringify(updatedDevConfig, null, 2)
                     );
                 }
+                output.success('Environment variables added successfully');
             } else {
-                logInfo("Edit whenever you're able, safe travels friend!");
+                output.info("Edit whenever you're able, safe travels friend!");
             }
+        } else {
+            output.success('All required environment variables are already configured');
         }
     }
 };

package/frigg-cli/install-command/environment-variables.test.js

@@ -1,16 +1,14 @@
 const { handleEnvVariables } = require('./environment-variables');
-const { logInfo } = require('./logger');
-const inquirer = require('inquirer');
+const output = require('../utils/output');
 const fs = require('fs');
 const dotenv = require('dotenv');
 const { resolve } = require('node:path');
 const { parse } = require('@babel/parser');
 const traverse = require('@babel/traverse');
 
-jest.mock('inquirer');
+jest.mock('../utils/output');
 jest.mock('fs');
 jest.mock('dotenv');
-jest.mock('./logger');
 jest.mock('@babel/parser');
 jest.mock('@babel/traverse');
 
@@ -99,22 +97,23 @@ describe('handleEnvVariables', () => {
             return '';
         });
 
-        inquirer.prompt
-            .mockResolvedValueOnce({ addEnvVars: true })
-            .mockResolvedValueOnce({ value: 'client_id_value' })
-            .mockResolvedValueOnce({ value: 'client_secret_value' })
-            .mockResolvedValueOnce({ value: 'redirect_uri_value' })
-            .mockResolvedValueOnce({ value: 'scope_value' });
+        output.confirm.mockResolvedValueOnce(true);
+        output.input
+            .mockResolvedValueOnce('client_id_value')
+            .mockResolvedValueOnce('client_secret_value')
+            .mockResolvedValueOnce('redirect_uri_value')
+            .mockResolvedValueOnce('scope_value');
 
         await handleEnvVariables(backendPath, modulePath);
 
-        expect(logInfo).toHaveBeenCalledWith(
+        expect(output.info).toHaveBeenCalledWith(
             'Searching for missing environment variables...'
         );
-        expect(logInfo).toHaveBeenCalledWith(
+        expect(output.warn).toHaveBeenCalledWith(
             'Missing environment variables: GOOGLE_CALENDAR_CLIENT_ID, GOOGLE_CALENDAR_CLIENT_SECRET, REDIRECT_URI, GOOGLE_CALENDAR_SCOPE'
         );
-        expect(inquirer.prompt).toHaveBeenCalledTimes(5);
+        expect(output.confirm).toHaveBeenCalledTimes(1);
+        expect(output.input).toHaveBeenCalledTimes(4);
         expect(fs.appendFileSync).toHaveBeenCalledWith(
             localEnvPath,
             '\nGOOGLE_CALENDAR_CLIENT_ID=client_id_value\nGOOGLE_CALENDAR_CLIENT_SECRET=client_secret_value\nREDIRECT_URI=redirect_uri_value\nGOOGLE_CALENDAR_SCOPE=scope_value'

package/frigg-cli/install-command/index.js

@@ -2,7 +2,7 @@ const { installPackage } = require('./install-package');
 const { createIntegrationFile } = require('./integration-file');
 const { resolve } = require('node:path');
 const { updateBackendJsFile } = require('./backend-js');
-const { logInfo, logError } = require('./logger');
+const output = require('../utils/output');
 const { commitChanges } = require('./commit-changes');
 const { handleEnvVariables } = require('./environment-variables');
 const {
@@ -35,18 +35,23 @@ const installCommand = async (apiModuleName) => {
             const sanitizedLabel = label.replace(
                 /[<>:"/\\|?*\x00-\x1F\s]/g,
                 ''
-            ); // Remove invalid characters and spaces            console.log('Installing integration for:', sanitizedLabel);
-            createIntegrationFile(backendPath, sanitizedLabel, ApiClass);
-            updateBackendJsFile(backendPath, sanitizedLabel);
-            commitChanges(backendPath, sanitizedLabel);
-            logInfo(
-                `Successfully installed ${packageName} and updated the project.`
-            );
+            ); // Remove invalid characters and spaces
+
+            const spinner = output.spinner(`Installing integration for ${sanitizedLabel}...`);
+            try {
+                createIntegrationFile(backendPath, sanitizedLabel, ApiClass);
+                updateBackendJsFile(backendPath, sanitizedLabel);
+                commitChanges(backendPath, sanitizedLabel);
+                spinner.succeed(`Successfully installed ${packageName} and updated the project.`);
+            } catch (innerError) {
+                spinner.fail(`Failed to install ${packageName}`);
+                throw innerError;
+            }
 
             await handleEnvVariables(backendPath, modulePath);
         }
     } catch (error) {
-        logError('An error occurred:', error);
+        output.error('An error occurred:', error);
         process.exit(1);
     }
 };

package/frigg-cli/install-command/integration-file.js

@@ -1,6 +1,6 @@
 const fs = require('fs-extra');
 const path = require('path');
-const { logInfo } = require('./logger');
+const output = require('../utils/output');
 const { getIntegrationTemplate } = require('./template');
 const INTEGRATIONS_DIR = 'src/integrations';
 
@@ -9,14 +9,14 @@ function createIntegrationFile(backendPath, apiModuleName, ApiClass) {
         path.dirname(backendPath),
         INTEGRATIONS_DIR
     );
-    logInfo(`Ensuring directory exists: ${integrationDir}`);
+    output.debug(`Ensuring directory exists: ${integrationDir}`);
     fs.ensureDirSync(integrationDir);
 
     const integrationFilePath = path.join(
         integrationDir,
         `${apiModuleName}Integration.js`
     );
-    logInfo(`Writing integration file: ${integrationFilePath}`);
+    output.debug(`Writing integration file: ${integrationFilePath}`);
     const integrationTemplate = getIntegrationTemplate(
         apiModuleName,
         backendPath,

package/frigg-cli/install-command/validate-package.js

@@ -1,7 +1,6 @@
 const { execSync } = require('child_process');
 const axios = require('axios');
-const { logError } = require('./logger');
-const { checkbox } = require('@inquirer/prompts');
+const output = require('../utils/output');
 
 async function searchPackages(apiModuleName) {
     const searchCommand = `npm search @friggframework/api-module-${apiModuleName} --json`;
@@ -31,7 +30,7 @@ const searchAndSelectPackage = async (apiModuleName) => {
     const searchResults = await searchPackages(apiModuleName || '');
 
     if (searchResults.length === 0) {
-        logError(`No packages found matching ${apiModuleName}`);
+        output.error(`No packages found matching ${apiModuleName}`);
         process.exit(1);
     }
 
@@ -44,7 +43,7 @@ const searchAndSelectPackage = async (apiModuleName) => {
         const earlierVersions = searchResults
             .map((pkg) => `${pkg.name} (${pkg.version})`)
             .join(', ');
-        logError(
+        output.error(
             `No packages found with version 1.0.0 or above for ${apiModuleName}. Found earlier versions: ${earlierVersions}`
         );
         process.exit(1);
@@ -58,11 +57,8 @@ const searchAndSelectPackage = async (apiModuleName) => {
         };
     });
 
-    const selectedPackages = await checkbox({
-        message: 'Select the packages to install:',
-        choices,
-    });
-    console.log('Selected packages:', selectedPackages);
+    const selectedPackages = await output.checkbox('Select the packages to install:', choices);
+    output.info(`Selected packages: ${selectedPackages.join(', ')}`);
 
     return selectedPackages.map((choice) => choice.split(' ')[0]);
 };

package/frigg-cli/jest.config.js

@@ -1,5 +1,8 @@
+const path = require('path');
+
 module.exports = {
   displayName: 'Frigg CLI Tests',
+  rootDir: __dirname,
   testMatch: [
     '<rootDir>/__tests__/**/*.test.js',
     '<rootDir>/__tests__/**/*.spec.js',
@@ -93,7 +96,7 @@ module.exports = {
     }
   },
   setupFilesAfterEnv: [
-    '<rootDir>/__tests__/utils/test-setup.js'
+    path.join(__dirname, '__tests__', 'utils', 'test-setup.js')
   ],
   testTimeout: 10000,
   maxWorkers: '50%',