@friggframework/devtools 2.0.0--canary.596.97a5c6b.0 → 2.0.0--canary.597.ea460ba.0

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

@@ -347,15 +347,46 @@ class IntegrationBuilder extends InfrastructureBuilder {
             console.log(`      ✓ Webhook handler function defined`);
         }
 
+        // Tier 3 Integration Extension routes (e.g. hubspot.extensions.webhooks).
+        // The integration-defined-routers handler already mounts these at
+        // runtime; emitting explicit httpApi events here registers them as
+        // dedicated routes (visible at startup, and matched ahead of the
+        // catch-all) instead of silently relying on {proxy+}. They point at
+        // the same handler as the catch-all. Route shape mirrors core's
+        // getExtensionRoutes; we read it directly to avoid coupling the
+        // build-time generator to a core runtime import.
+        const extensionBindings = Object.values(
+            integration.Definition.extensions || {}
+        );
+        const extensionRouteEvents = [];
+        for (const binding of extensionBindings) {
+            const routes =
+                (binding && binding.extension && binding.extension.routes) ||
+                [];
+            for (const route of routes) {
+                extensionRouteEvents.push({
+                    httpApi: {
+                        path: `/api/${integrationName}-integration${route.path}`,
+                        method: route.method,
+                    },
+                });
+            }
+        }
+        if (extensionRouteEvents.length > 0) {
+            console.log(
+                `      ✓ ${extensionRouteEvents.length} extension route(s) defined`
+            );
+        }
+
         // Create HTTP API handler for integration (catch-all route AFTER
-        // webhooks). Tier 3 extension routes are NOT folded in here — each
-        // binding gets its own function below so it can have its own DB infra.
+        // webhooks and extension routes)
         result.functions[integrationName] = {
             handler: `node_modules/@friggframework/core/handlers/routers/integration-defined-routers.handlers.${integrationName}.handler`,
             skipEsbuild: true, // Nested exports in node_modules - skip esbuild bundling
             package: functionPackageConfig,
             ...(usePrismaLayer && { layers: [{ Ref: 'PrismaLambdaLayer' }] }), // HTTP handlers need Prisma for integration queries
             events: [
+                ...extensionRouteEvents,
                 {
                     httpApi: {
                         path: `/api/${integrationName}-integration/{proxy+}`,
@@ -366,62 +397,6 @@ class IntegrationBuilder extends InfrastructureBuilder {
         };
         console.log(`      ✓ HTTP handler function defined`);
 
-        // Tier 3 Integration Extensions — one dedicated function per binding,
-        // namespaced under /{bindingKey} so multiple modules' extensions (e.g.
-        // hubspot + clockwork webhooks) never collide on the same path. The
-        // Prisma layer is attached only when the extension/binding declares
-        // useDatabase: true (default false → DB-free receiver, faster cold
-        // start). Route shape mirrors core's getExtensionRoutes; read directly
-        // to avoid coupling the build-time generator to a core runtime import.
-        const sanitizeBindingKey = (name) =>
-            String(name).replace(/[^A-Za-z0-9]/g, '');
-        const extensionEntries = Object.entries(
-            integration.Definition.extensions || {}
-        );
-        for (const [bindingKey, binding] of extensionEntries) {
-            const extension = binding && binding.extension;
-            const routes = (extension && extension.routes) || [];
-            if (routes.length === 0) continue;
-            const useDatabase =
-                binding.useDatabase ??
-                (extension && extension.useDatabase) ??
-                false;
-            // fnName is the wire contract with core's integration-defined-routers
-            // (it exports handlers[`${name}__${sanitizeBindingKey(binding)}`]).
-            // Keep this derivation IN SYNC with that file.
-            const fnName = `${integrationName}__${sanitizeBindingKey(
-                bindingKey
-            )}`;
-            // Guard the same silent-overwrite the runtime router guards: two
-            // binding keys that sanitize to the same value would clobber one
-            // function definition while leaving both httpApi paths live.
-            if (
-                Object.prototype.hasOwnProperty.call(result.functions, fnName)
-            ) {
-                throw new Error(
-                    `Integration "${integrationName}" extension function conflict: ` +
-                        `binding "${bindingKey}" sanitizes to "${fnName}", which is already taken. ` +
-                        `Use binding keys that are distinct after stripping non-alphanumeric characters.`
-                );
-            }
-            result.functions[fnName] = {
-                handler: `node_modules/@friggframework/core/handlers/routers/integration-defined-routers.handlers.${fnName}.handler`,
-                skipEsbuild: true,
-                package: functionPackageConfig,
-                ...(usePrismaLayer &&
-                    useDatabase && { layers: [{ Ref: 'PrismaLambdaLayer' }] }),
-                events: routes.map((route) => ({
-                    httpApi: {
-                        path: `/api/${integrationName}-integration/${bindingKey}${route.path}`,
-                        method: route.method,
-                    },
-                })),
-            };
-            console.log(
-                `      ✓ Extension handler function defined: ${fnName} (useDatabase: ${useDatabase})`
-            );
-        }
-
         // Create Queue Worker function
         const queueWorkerName = `${integrationName}QueueWorker`;
         result.functions[queueWorkerName] = {

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

@@ -568,7 +568,7 @@ describe('IntegrationBuilder', () => {
             ]);
         });
 
-        it('emits a dedicated per-binding function (namespaced) for Tier 3 extension routes; the main handler keeps only {proxy+}', async () => {
+        it('should emit dedicated httpApi events for Tier 3 extension routes, before the catch-all', async () => {
             const appDefinition = {
                 integrations: [
                     {
@@ -602,24 +602,15 @@ describe('IntegrationBuilder', () => {
 
             const result = await integrationBuilder.build(appDefinition, {});
 
-            // Dedicated per-binding function, namespaced under the binding key,
-            // pointing at its own handler export.
-            const fn = result.functions.hubspot__hubspotWebhooks;
-            expect(fn).toBeDefined();
-            expect(fn.handler).toBe(
-                'node_modules/@friggframework/core/handlers/routers/integration-defined-routers.handlers.hubspot__hubspotWebhooks.handler'
-            );
-            expect(fn.events).toEqual([
+            // The extension route is registered on the same handler as the
+            // catch-all, and ordered before {proxy+}.
+            expect(result.functions.hubspot.events).toEqual([
                 {
                     httpApi: {
-                        path: '/api/hubspot-integration/hubspotWebhooks/webhooks',
+                        path: '/api/hubspot-integration/webhooks',
                         method: 'POST',
                     },
                 },
-            ]);
-
-            // The main integration handler keeps only the catch-all.
-            expect(result.functions.hubspot.events).toEqual([
                 {
                     httpApi: {
                         path: '/api/hubspot-integration/{proxy+}',
@@ -627,69 +618,6 @@ describe('IntegrationBuilder', () => {
                     },
                 },
             ]);
-
-            // useDatabase defaults to false → no Prisma layer on the receiver.
-            expect(fn.layers).toBeUndefined();
-        });
-
-        it('attaches the Prisma layer to a per-binding function only when useDatabase is true', async () => {
-            const mkDef = (useDatabase) => ({
-                integrations: [
-                    {
-                        Definition: {
-                            name: 'hs',
-                            extensions: {
-                                wh: {
-                                    extension: {
-                                        name: 'wh-ext',
-                                        useDatabase,
-                                        routes: [
-                                            {
-                                                path: '/webhooks',
-                                                method: 'POST',
-                                                event: 'E',
-                                            },
-                                        ],
-                                        events: { E: { handler: () => {} } },
-                                    },
-                                },
-                            },
-                        },
-                    },
-                ],
-            });
-
-            const withDb = await integrationBuilder.build(mkDef(true), {});
-            expect(withDb.functions.hs__wh.layers).toEqual([
-                { Ref: 'PrismaLambdaLayer' },
-            ]);
-
-            const withoutDb = await integrationBuilder.build(mkDef(false), {});
-            expect(withoutDb.functions.hs__wh.layers).toBeUndefined();
-        });
-
-        it('throws when two binding keys sanitize to the same function name', async () => {
-            const mkExt = (name, event) => ({
-                name,
-                routes: [{ path: '/w', method: 'POST', event }],
-                events: { [event]: { handler: () => {} } },
-            });
-            const appDefinition = {
-                integrations: [
-                    {
-                        Definition: {
-                            name: 'hs',
-                            extensions: {
-                                'hub-spot': { extension: mkExt('a', 'A') }, // → hs__hubspot
-                                hubspot: { extension: mkExt('b', 'B') }, // → hs__hubspot
-                            },
-                        },
-                    },
-                ],
-            };
-            await expect(
-                integrationBuilder.build(appDefinition, {})
-            ).rejects.toThrow(/extension function conflict.*hs__hubspot/);
         });
 
         it('should only have the catch-all proxy route when no extensions are declared', async () => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.596.97a5c6b.0",
+  "version": "2.0.0--canary.597.ea460ba.0",
   "bin": {
     "frigg": "./frigg-cli/index.js"
   },
@@ -25,9 +25,9 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/core": "2.0.0--canary.596.97a5c6b.0",
-    "@friggframework/schemas": "2.0.0--canary.596.97a5c6b.0",
-    "@friggframework/test": "2.0.0--canary.596.97a5c6b.0",
+    "@friggframework/core": "2.0.0--canary.597.ea460ba.0",
+    "@friggframework/schemas": "2.0.0--canary.597.ea460ba.0",
+    "@friggframework/test": "2.0.0--canary.597.ea460ba.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -55,8 +55,8 @@
     "validate-npm-package-name": "^5.0.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.596.97a5c6b.0",
-    "@friggframework/prettier-config": "2.0.0--canary.596.97a5c6b.0",
+    "@friggframework/eslint-config": "2.0.0--canary.597.ea460ba.0",
+    "@friggframework/prettier-config": "2.0.0--canary.597.ea460ba.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -88,5 +88,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "97a5c6bc4217a0fcaaa6e6fa7baeb4b179f06d41"
+  "gitHead": "ea460ba4cff4f584ecd38c0973dc966f09ee1ca8"
 }