@friggframework/devtools 2.0.0--canary.596.6355e72.0 → 2.0.0--canary.596.fc8739c.0

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

@@ -348,8 +348,7 @@ class IntegrationBuilder extends InfrastructureBuilder {
         }
 
         // 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). Extension routes get their own functions below.
         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
@@ -366,13 +365,8 @@ 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.
+        // One serverless function per extension binding, namespaced under
+        // /{bindingKey}. Prisma layer attached only when useDatabase is true.
         const sanitizeBindingKey = (name) =>
             String(name).replace(/[^A-Za-z0-9]/g, '');
         const extensionEntries = Object.entries(
@@ -386,9 +380,21 @@ class IntegrationBuilder extends InfrastructureBuilder {
                 binding.useDatabase ??
                 (extension && extension.useDatabase) ??
                 false;
+            // Wire contract: core's integration-defined-routers derives the
+            // identical handler key. Keep both in sync.
             const fnName = `${integrationName}__${sanitizeBindingKey(
                 bindingKey
             )}`;
+            // Distinct binding keys can sanitize to the same fnName — fail loud rather than overwrite.
+            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/infrastructure/domains/integration/integration-builder.test.js

@@ -668,6 +668,30 @@ describe('IntegrationBuilder', () => {
             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 () => {
             const appDefinition = {
                 integrations: [{ Definition: { name: 'plain' } }],

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.596.6355e72.0",
+  "version": "2.0.0--canary.596.fc8739c.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.6355e72.0",
-    "@friggframework/schemas": "2.0.0--canary.596.6355e72.0",
-    "@friggframework/test": "2.0.0--canary.596.6355e72.0",
+    "@friggframework/core": "2.0.0--canary.596.fc8739c.0",
+    "@friggframework/schemas": "2.0.0--canary.596.fc8739c.0",
+    "@friggframework/test": "2.0.0--canary.596.fc8739c.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.6355e72.0",
-    "@friggframework/prettier-config": "2.0.0--canary.596.6355e72.0",
+    "@friggframework/eslint-config": "2.0.0--canary.596.fc8739c.0",
+    "@friggframework/prettier-config": "2.0.0--canary.596.fc8739c.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": "6355e7230ef1f29f10e5336c88d4ddd257dffe18"
+  "gitHead": "fc8739c1c49a9731b8465e0d5e864c71db20c581"
 }