@friggframework/devtools 2.0.0--canary.522.923dfae.0 → 2.0.0--canary.540.c5ef83f.0

package/frigg-cli/init-command/template-handler.js

@@ -75,16 +75,6 @@ class TemplateHandler {
                 return !['node_modules', '.serverless', 'dist', 'build'].includes(basename);
             }
         });
-
-        // Rename .env.default to .env if it exists and .env doesn't already exist
-        const envDefaultPath = path.join(target, '.env.default');
-        const envPath = path.join(target, '.env');
-        if (fs.existsSync(envDefaultPath) && !fs.existsSync(envPath)) {
-            await fs.rename(envDefaultPath, envPath);
-        } else if (fs.existsSync(envDefaultPath)) {
-            // Remove the .env.default if .env already exists
-            await fs.remove(envDefaultPath);
-        }
     }
 
     /**
@@ -110,14 +100,14 @@ class TemplateHandler {
     async updateServerlessConfig() {
         const serverlessPath = path.join(this.targetPath, 'serverless.yml');
         let serverlessContent = await fs.readFile(serverlessPath, 'utf8');
-
+        
         // Update service name based on directory name
         const projectName = path.basename(this.targetPath);
         serverlessContent = serverlessContent.replace(
-            /^service: frigg-app$/m,
+            /^service: create-frigg-app$/m,
             `service: ${projectName}`
         );
-
+        
         await fs.writeFile(serverlessPath, serverlessContent);
     }
 

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

@@ -1,12 +1,12 @@
 const fs = require('fs-extra');
 const path = require('path');
-const output = require('../utils/output');
+const { logInfo } = require('./logger');
 const INTEGRATIONS_DIR = 'src/integrations';
 const BACKEND_JS = 'backend.js';
 
 function updateBackendJsFile(backendPath, apiModuleName) {
     const backendJsPath = path.join(path.dirname(backendPath), BACKEND_JS);
-    output.debug(`Updating backend.js: ${backendJsPath}`);
+    logInfo(`Updating backend.js: ${backendJsPath}`);
     updateBackendJs(backendJsPath, apiModuleName);
 }
 
@@ -21,7 +21,7 @@ function updateBackendJs(backendJsPath, apiModuleName) {
         );
         fs.writeFileSync(backendJsPath, importStatement + updatedContent);
     } else {
-        output.debug(
+        logInfo(
             `Import statement for ${apiModuleName}Integration already exists in backend.js`
         );
     }

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

@@ -1,8 +1,9 @@
 const fs = require('fs');
 const dotenv = require('dotenv');
 const { readFileSync, writeFileSync, existsSync } = require('fs');
-const output = require('../utils/output');
+const { logInfo } = require('./logger');
 const { resolve } = require('node:path');
+const { confirm, input } = require('@inquirer/prompts');
 const { parse } = require('@babel/parser');
 const traverse = require('@babel/traverse').default;
 
@@ -42,14 +43,15 @@ const extractRawEnvVariables = (modulePath) => {
     return envVariables;
 };
 const handleEnvVariables = async (backendPath, modulePath) => {
-    output.info('Searching for missing environment variables...');
+    logInfo('Searching for missing environment variables...');
     const Definition = { env: extractRawEnvVariables(modulePath) };
     if (Definition && Definition.env) {
-        output.debug('Definition.env:', JSON.stringify(Definition.env));
+        console.log('Here is Definition.env:', Definition.env);
         const envVars = Object.values(Definition.env);
 
-        output.info(
-            `Found environment variables in API module: ${envVars.join(', ')}`
+        console.log(
+            'Found the following environment variables in the API module:',
+            envVars
         );
 
         const localEnvPath = resolve(backendPath, '../.env');
@@ -76,19 +78,23 @@ const handleEnvVariables = async (backendPath, modulePath) => {
             (envVar) => !localEnvVars[envVar] && !localDevConfig[envVar]
         );
 
-        if (missingEnvVars.length > 0) {
-            output.warn(`Missing environment variables: ${missingEnvVars.join(', ')}`);
+        logInfo(`Missing environment variables: ${missingEnvVars.join(', ')}`);
 
-            const addEnvVars = await output.confirm(
-                `The following environment variables are required: ${missingEnvVars.join(
+        if (missingEnvVars.length > 0) {
+            const addEnvVars = await confirm({
+                message: `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 output.input(`Enter value for ${envVar}:`);
+                    const value = await input({
+                        type: 'input',
+                        name: 'value',
+                        message: `Enter value for ${envVar}:`,
+                    });
                     envValues[envVar] = value;
                 }
 
@@ -111,12 +117,9 @@ const handleEnvVariables = async (backendPath, modulePath) => {
                         JSON.stringify(updatedDevConfig, null, 2)
                     );
                 }
-                output.success('Environment variables added successfully');
             } else {
-                output.info("Edit whenever you're able, safe travels friend!");
+                logInfo("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,14 +1,16 @@
 const { handleEnvVariables } = require('./environment-variables');
-const output = require('../utils/output');
+const { logInfo } = require('./logger');
+const inquirer = require('inquirer');
 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('../utils/output');
+jest.mock('inquirer');
 jest.mock('fs');
 jest.mock('dotenv');
+jest.mock('./logger');
 jest.mock('@babel/parser');
 jest.mock('@babel/traverse');
 
@@ -97,23 +99,22 @@ describe('handleEnvVariables', () => {
             return '';
         });
 
-        output.confirm.mockResolvedValueOnce(true);
-        output.input
-            .mockResolvedValueOnce('client_id_value')
-            .mockResolvedValueOnce('client_secret_value')
-            .mockResolvedValueOnce('redirect_uri_value')
-            .mockResolvedValueOnce('scope_value');
+        inquirer.prompt
+            .mockResolvedValueOnce({ addEnvVars: true })
+            .mockResolvedValueOnce({ value: 'client_id_value' })
+            .mockResolvedValueOnce({ value: 'client_secret_value' })
+            .mockResolvedValueOnce({ value: 'redirect_uri_value' })
+            .mockResolvedValueOnce({ value: 'scope_value' });
 
         await handleEnvVariables(backendPath, modulePath);
 
-        expect(output.info).toHaveBeenCalledWith(
+        expect(logInfo).toHaveBeenCalledWith(
             'Searching for missing environment variables...'
         );
-        expect(output.warn).toHaveBeenCalledWith(
+        expect(logInfo).toHaveBeenCalledWith(
             'Missing environment variables: GOOGLE_CALENDAR_CLIENT_ID, GOOGLE_CALENDAR_CLIENT_SECRET, REDIRECT_URI, GOOGLE_CALENDAR_SCOPE'
         );
-        expect(output.confirm).toHaveBeenCalledTimes(1);
-        expect(output.input).toHaveBeenCalledTimes(4);
+        expect(inquirer.prompt).toHaveBeenCalledTimes(5);
         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 output = require('../utils/output');
+const { logInfo, logError } = require('./logger');
 const { commitChanges } = require('./commit-changes');
 const { handleEnvVariables } = require('./environment-variables');
 const {
@@ -35,23 +35,18 @@ const installCommand = async (apiModuleName) => {
             const sanitizedLabel = label.replace(
                 /[<>:"/\\|?*\x00-\x1F\s]/g,
                 ''
-            ); // 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;
-            }
+            ); // 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.`
+            );
 
             await handleEnvVariables(backendPath, modulePath);
         }
     } catch (error) {
-        output.error('An error occurred:', error);
+        logError('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 output = require('../utils/output');
+const { logInfo } = require('./logger');
 const { getIntegrationTemplate } = require('./template');
 const INTEGRATIONS_DIR = 'src/integrations';
 
@@ -9,14 +9,14 @@ function createIntegrationFile(backendPath, apiModuleName, ApiClass) {
         path.dirname(backendPath),
         INTEGRATIONS_DIR
     );
-    output.debug(`Ensuring directory exists: ${integrationDir}`);
+    logInfo(`Ensuring directory exists: ${integrationDir}`);
     fs.ensureDirSync(integrationDir);
 
     const integrationFilePath = path.join(
         integrationDir,
         `${apiModuleName}Integration.js`
     );
-    output.debug(`Writing integration file: ${integrationFilePath}`);
+    logInfo(`Writing integration file: ${integrationFilePath}`);
     const integrationTemplate = getIntegrationTemplate(
         apiModuleName,
         backendPath,

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

@@ -0,0 +1,12 @@
+function logInfo(message) {
+    console.log(message);
+}
+
+function logError(message, error) {
+    console.error(message, error);
+}
+
+module.exports = {
+    logInfo,
+    logError,
+};

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

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

package/frigg-cli/jest.config.js

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