@friggframework/devtools 2.0.0--canary.657.e372ef6.0 → 2.0.0--canary.639.0335a94.0

package/frigg-cli/index.js

@@ -91,11 +91,14 @@ const { ssmPushCommand } = require('./ssm-command');
 const program = new Command();
 
 program
-    .command('init [templateName]')
+    .command('init [projectName]')
     .description('Initialize a new Frigg application')
-    .option('-t, --template <template>', 'template to use', 'backend-only')
-    .option('-n, --name <name>', 'project name')
-    .option('-d, --directory <directory>', 'target directory')
+    .option('-n, --name <name>', 'project name (alternative to the positional argument)')
+    .option('-m, --mode <mode>', 'deployment mode: standalone or embedded')
+    .option('--no-frontend', 'skip the optional demo frontend')
+    .option('-f, --force', 'scaffold into a non-empty directory')
+    .option('-v, --verbose', 'enable verbose output')
+    .option('-t, --template <template>', 'legacy template (no longer supported)')
     .action(initCommand);
 
 program

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

@@ -50,19 +50,32 @@ function checkNodeVersion() {
     }
 }
 
-async function initCommand(projectName, options) {
+async function initCommand(projectName, options = {}) {
     const verbose = options.verbose || false;
     const force = options.force || false;
-    
+
     checkNodeVersion();
 
-    const root = path.resolve(projectName);
+    // Accept the project name from the positional argument or the --name flag.
+    const targetName = projectName || options.name;
+    if (!targetName) {
+        console.error(
+            chalk.red(
+                'Please specify a project name:\n' +
+                    `  ${chalk.cyan('frigg init')} ${chalk.green('<project-name>')}\n`
+            )
+        );
+        process.exit(1);
+    }
+
+    const root = path.resolve(targetName);
     const appName = path.basename(root);
 
     checkAppName(appName);
-    
-    // Use backend-first handler by default
-    if (!options.template && !options.legacyFrontend) {
+
+    // A --template flag is legacy and no longer supported; without it, the
+    // backend-first handler is the default path for `frigg init`.
+    if (!options.template) {
         try {
             const handler = new BackendFirstHandler(root, {
                 force,

package/frigg-cli/templates/backend/README.md

@@ -0,0 +1,69 @@
+# Frigg Backend
+
+A [Frigg Framework](https://docs.friggframework.org) backend application, scaffolded with `frigg init`.
+
+## Project structure
+
+| File | Purpose |
+| --- | --- |
+| `index.js` | Your **app definition** — exports `Definition`, which declares integrations, the database, encryption, users, and VPC settings. This is the file you edit. |
+| `infrastructure.js` | Serverless entry point consumed by `frigg build` / `frigg deploy`. Reads `Definition` from `index.js`; you normally never edit it. |
+
+## Getting started
+
+```bash
+# 1. Install dependencies (if not already installed by `frigg init`)
+npm install
+
+# 2. Set up the database schema and generate the Prisma client
+frigg db:setup
+
+# 3. Run locally
+frigg start
+```
+
+Add an integration (installs the API module and scaffolds an integration file):
+
+```bash
+frigg install hubspot
+```
+
+Then register the generated integration class in the `integrations` array in `index.js`.
+
+## Configuration
+
+The app definition in `index.js` is validated against the Frigg app-definition schema.
+Common settings:
+
+- **Database** — enable `postgres` or `mongoDB` under `database`. The connection
+  string comes from the `DATABASE_URL` environment variable.
+- **Encryption** — `encryption.fieldLevelEncryptionMethod` is `kms` (recommended
+  for production) or `aes`. Encryption is automatically bypassed in the
+  `dev`/`test`/`local` stages.
+- **VPC** — set `vpc.enable` to `true` for production deployments in private subnets.
+
+### Environment variables
+
+Create a `.env` file for local development. Typical values:
+
+```bash
+STAGE=dev
+AWS_REGION=us-east-1
+DATABASE_URL=postgresql://postgres:postgres@localhost:5432/frigg
+# For AES encryption in any stage:
+# AES_KEY_ID=local-dev-key
+# AES_KEY=change-me-to-a-32-character-secret
+```
+
+## Deploy
+
+```bash
+frigg build --production     # build with AWS resource discovery
+frigg deploy --stage prod    # deploy via osls
+frigg doctor <stack-name>    # verify the deployed stack
+```
+
+## Learn more
+
+- Documentation: https://docs.friggframework.org
+- Issues & support: https://github.com/friggframework/frigg/issues

package/frigg-cli/templates/backend/index.js

@@ -0,0 +1,62 @@
+/**
+ * Frigg Application Definition
+ *
+ * This is the entry point for your Frigg backend. The exported `Definition`
+ * object is read by `infrastructure.js` (via `createFriggInfrastructure()`) to
+ * compose your serverless infrastructure, and by the Frigg runtime to wire up
+ * your integrations, database, encryption, and HTTP handlers.
+ *
+ * Add integrations with `frigg install <module>` (e.g. `frigg install hubspot`),
+ * which installs the API module and scaffolds an integration file under
+ * `src/integrations/`.
+ *
+ * See https://docs.friggframework.org for the full app-definition reference.
+ */
+
+'use strict';
+
+// Import your integrations here
+// const ExampleIntegration = require('./src/integrations/ExampleIntegration');
+
+const appDefinition = {
+    // Human-friendly name for this Frigg application.
+    name: 'frigg-app',
+
+    // The integrations this application exposes. Each entry is an
+    // IntegrationBase subclass. Install modules with `frigg install <module>`.
+    integrations: [
+        // Add your integrations here as you install them
+        // Example:
+        // ExampleIntegration,
+    ],
+
+    // User model. Password auth is enabled by default so the Management UI and
+    // API can authenticate users out of the box.
+    user: {
+        usePassword: true,
+    },
+
+    // Field-level encryption for sensitive data (credentials, tokens, mappings).
+    // KMS is recommended for production; encryption is automatically bypassed in
+    // the dev/test/local stages. Set to 'aes' to use AES with AES_KEY/AES_KEY_ID.
+    encryption: {
+        fieldLevelEncryptionMethod: 'kms',
+    },
+
+    // Database. Enable exactly one backend. PostgreSQL/Aurora is shown here;
+    // set `mongoDB: { enable: true }` instead to use MongoDB. The connection
+    // string comes from the DATABASE_URL environment variable.
+    database: {
+        postgres: {
+            enable: true,
+            management: 'discover',
+        },
+    },
+
+    // VPC deployment. Enable for production so Lambdas run in private subnets.
+    vpc: {
+        enable: false,
+    },
+};
+
+module.exports = { Definition: appDefinition };

package/frigg-cli/templates/backend/infrastructure.js

@@ -0,0 +1,20 @@
+/**
+ * Frigg Infrastructure Entry Point
+ *
+ * This file is the serverless configuration consumed by the Frigg CLI
+ * (`frigg build` / `frigg deploy`, which run `osls --config infrastructure.js`).
+ *
+ * `createFriggInfrastructure()` reads the `Definition` exported from `index.js`,
+ * runs AWS resource discovery (VPC, KMS, Aurora, etc.), and composes the full
+ * serverless definition. It returns a Promise that resolves to that definition,
+ * which Serverless/osls awaits automatically.
+ *
+ * You normally never need to edit this file — customize your application through
+ * the app definition in `index.js` instead.
+ */
+
+'use strict';
+
+const { createFriggInfrastructure } = require('@friggframework/devtools');
+
+module.exports = createFriggInfrastructure();

package/infrastructure/domains/integration/integration-builder.test.js

@@ -10,8 +10,6 @@ const {
 } = require('@friggframework/core/queues/queue-delivery');
 const { IntegrationBuilder } = require('./integration-builder');
 const { ValidationResult } = require('../shared/base-builder');
-const { BuilderOrchestrator } = require('../shared/builder-orchestrator');
-const { SchedulerBuilder } = require('../scheduler/scheduler-builder');
 
 describe('IntegrationBuilder', () => {
     let integrationBuilder;
@@ -261,37 +259,6 @@ describe('IntegrationBuilder', () => {
             ).toBeUndefined();
         });
 
-        it('adds no resource, function or env var when no module declares rateLimit', async () => {
-            class Api {}
-            const { merged } = await new BuilderOrchestrator([
-                new IntegrationBuilder(),
-                new SchedulerBuilder(),
-            ]).buildAll({
-                integrations: [
-                    {
-                        Definition: {
-                            name: 'test',
-                            modules: { crm: { definition: { API: Api } } },
-                        },
-                    },
-                ],
-            });
-            const before = await integrationBuilder.build(
-                { integrations: [{ Definition: { name: 'test' } }] },
-                {}
-            );
-
-            expect(Object.keys(merged.resources)).toEqual(
-                Object.keys(before.resources)
-            );
-            expect(Object.keys(merged.functions)).toEqual(
-                Object.keys(before.functions)
-            );
-            expect(Object.keys(merged.environment)).toEqual(
-                Object.keys(before.environment)
-            );
-        });
-
         it('should create queue worker function', async () => {
             const appDefinition = {
                 integrations: [

package/infrastructure/domains/scheduler/scheduler-builder.js

@@ -19,11 +19,6 @@ const {
     getAdminFunctionNames,
 } = require('../shared/function-environments');
 
-const declaresRateLimit = (integration) =>
-    Object.values(integration?.Definition?.modules ?? {}).some((module) =>
-        Boolean(module?.definition?.API?.rateLimit)
-    );
-
 class SchedulerBuilder extends InfrastructureBuilder {
     constructor() {
         super();
@@ -42,8 +37,7 @@ class SchedulerBuilder extends InfrastructureBuilder {
             return appDefinition.integrations.some(
                 (integration) =>
                     integration?.Definition?.webhooks?.enabled === true ||
-                    integration?.Definition?.webhooks === true ||
-                    declaresRateLimit(integration)
+                    integration?.Definition?.webhooks === true
             );
         }
 

package/infrastructure/domains/scheduler/scheduler-builder.test.js

@@ -38,61 +38,6 @@ describe('SchedulerBuilder', () => {
             ).toBe(true);
         });
 
-        it('runs when any module declares a rate limit', () => {
-            class Api {
-                static rateLimit = { minRetryAfterMs: 1_000 };
-            }
-            expect(
-                schedulerBuilder.shouldExecute({
-                    integrations: [
-                        { Definition: { name: 'a' } },
-                        {
-                            Definition: {
-                                name: 'b',
-                                modules: { crm: { definition: { API: Api } } },
-                            },
-                        },
-                    ],
-                })
-            ).toBe(true);
-        });
-
-        it('skips a module whose API declares no rate limit', () => {
-            class Api {}
-            expect(
-                schedulerBuilder.shouldExecute({
-                    integrations: [
-                        {
-                            Definition: {
-                                name: 'a',
-                                modules: { crm: { definition: { API: Api } } },
-                            },
-                        },
-                    ],
-                })
-            ).toBe(false);
-        });
-
-        it.each([
-            ['no modules', { name: 'a' }],
-            ['an empty modules object', { name: 'a', modules: {} }],
-            [
-                'a module with no definition',
-                { name: 'a', modules: { crm: {} } },
-            ],
-            ['a null module', { name: 'a', modules: { crm: null } }],
-            [
-                'a definition with no API',
-                { name: 'a', modules: { crm: { definition: {} } } },
-            ],
-        ])('skips an integration with %s', (_label, Definition) => {
-            expect(
-                schedulerBuilder.shouldExecute({
-                    integrations: [{ Definition }],
-                })
-            ).toBe(false);
-        });
-
         it('skips otherwise', () => {
             expect(
                 schedulerBuilder.shouldExecute({

package/infrastructure/domains/shared/utilities/base-definition-factory.js

@@ -195,7 +195,6 @@ function createBaseDefinition(
                         'sqs:SendMessageBatch',
                         'sqs:GetQueueUrl',
                         'sqs:GetQueueAttributes',
-                        'sqs:ChangeMessageVisibility',
                     ],
                     Resource: [
                         { 'Fn::GetAtt': ['InternalErrorQueue', 'Arn'] },

package/infrastructure/domains/shared/utilities/base-definition-factory.test.js

@@ -135,18 +135,6 @@ describe('Base Definition Factory', () => {
             expect(sqsPermission).toBeDefined();
         });
 
-        it('should let a function extend the visibility timeout of a message on an integration queue', () => {
-            const result = createBaseDefinition({}, {}, {});
-
-            const sqsPermission = result.provider.iamRoleStatements.find(
-                (stmt) => stmt.Action.includes('sqs:SendMessage')
-            );
-            expect(sqsPermission.Action).toContain(
-                'sqs:ChangeMessageVisibility'
-            );
-            expect(JSON.stringify(sqsPermission.Resource)).toContain('*Queue');
-        });
-
         it('should include required plugins', () => {
             const result = createBaseDefinition({}, {}, {});
 

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.657.e372ef6.0",
+  "version": "2.0.0--canary.639.0335a94.0",
   "bin": {
     "frigg": "./frigg-cli/index.js"
   },
   "files": [
     "frigg-cli/",
+    "frigg-cli/templates/",
     "infrastructure/",
     "migrations/",
     "management-ui/dist/",
@@ -26,9 +27,9 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/core": "2.0.0--canary.657.e372ef6.0",
-    "@friggframework/schemas": "2.0.0--canary.657.e372ef6.0",
-    "@friggframework/test": "2.0.0--canary.657.e372ef6.0",
+    "@friggframework/core": "2.0.0--canary.639.0335a94.0",
+    "@friggframework/schemas": "2.0.0--canary.639.0335a94.0",
+    "@friggframework/test": "2.0.0--canary.639.0335a94.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.18.0",
@@ -56,8 +57,8 @@
     "validate-npm-package-name": "^5.0.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.657.e372ef6.0",
-    "@friggframework/prettier-config": "2.0.0--canary.657.e372ef6.0",
+    "@friggframework/eslint-config": "2.0.0--canary.639.0335a94.0",
+    "@friggframework/prettier-config": "2.0.0--canary.639.0335a94.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -89,5 +90,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e372ef6b74e5bb76673a99181fed6d54d097dc99"
+  "gitHead": "0335a948a591f52cd167a421d3ce31d870ce4e43"
 }