fix: trust discovered entry points for hyphenated functions

src/functionsShellCommandAction.spec.ts

@@ -0,0 +1,43 @@
+import { expect } from "chai";
+
+import { initializeFunctionsShellContext } from "./functionsShellCommandAction";
+import { EmulatedTriggerDefinition } from "./emulator/functionsEmulatorShared";
+import { FunctionsEmulatorShell } from "./emulator/functionsEmulatorShell";
+
+describe("initializeFunctionsShellContext", () => {
+  it("uses trigger.entryPoint for shell bindings", () => {
+    const hyphenatedTrigger: EmulatedTriggerDefinition = {
+      id: "us-central1-dummystore-bot",
+      region: "us-central1",
+      platform: "gcfv1",
+      name: "dummystore-bot",
+      entryPoint: "dummystore-bot",
+      httpsTrigger: {},
+    };
+    const groupedTrigger: EmulatedTriggerDefinition = {
+      id: "us-central1-grouped-fn",
+      region: "us-central1",
+      platform: "gcfv1",
+      name: "grouped-fn",
+      entryPoint: "grouped.fn",
+      httpsTrigger: {},
+    };
+
+    const emulator = {
+      triggers: [hyphenatedTrigger, groupedTrigger],
+      emulatedFunctions: [hyphenatedTrigger.id, groupedTrigger.id],
+      urls: {
+        [hyphenatedTrigger.id]: "http://127.0.0.1/hyphenated",
+        [groupedTrigger.id]: "http://127.0.0.1/grouped",
+      },
+    } as FunctionsEmulatorShell;
+
+    const context: Record<string, unknown> = {};
+    initializeFunctionsShellContext(context, emulator);
+
+    expect(context).to.have.property("dummystore-bot").that.is.a("function");
+    expect(context).to.not.have.nested.property("dummystore.bot");
+    expect(context).to.have.nested.property("grouped.fn").that.is.a("function");
+    expect(context).to.have.property("help").that.is.a("string");
+  });
+});

src/functionsShellCommandAction.ts

@@ -20,7 +20,22 @@
 
 const serveFunctions = new FunctionsServer();
 
+export const initializeFunctionsShellContext = (
+  context: Record<string, any>,
+  emulator: shell.FunctionsEmulatorShell,
+) => {
+  for (const trigger of emulator.triggers) {
+    if (emulator.emulatedFunctions.includes(trigger.id)) {
+      const localFunction = new LocalFunction(trigger, emulator.urls, emulator);
+      _.set(context, trigger.entryPoint, localFunction.makeFn());
+    }
+  }
+  context.help =
+    "Instructions for the Functions Shell can be found at: " +
+    "https://firebase.google.com/docs/functions/local-emulator";
+};
+
 export const actionFunction = async (options: Options) => {
   if (typeof options.port === "string") {
     options.port = parseInt(options.port, 10);
   }
@@ -95,19 +110,6 @@
         process.exit();
       }
 
-      const initializeContext = (context: any) => {
-        for (const trigger of emulator.triggers) {
-          if (emulator.emulatedFunctions.includes(trigger.id)) {
-            const localFunction = new LocalFunction(trigger, emulator.urls, emulator);
-            const triggerNameDotNotation = trigger.name.replace(/-/g, ".");
-            _.set(context, triggerNameDotNotation, localFunction.makeFn());
-          }
-        }
-        context.help =
-          "Instructions for the Functions Shell can be found at: " +
-          "https://firebase.google.com/docs/functions/local-emulator";
-      };
-
       for (const e of runningEmulators) {
         const info = remoteEmulators[e];
         utils.logLabeledBullet(
@@ -124,7 +126,7 @@
         )}`,
       );
 
       const writer = (output: any) => {
         if (output === HTTPS_SENTINEL) {
           return HTTPS_SENTINEL;
         }
@@ -138,11 +140,11 @@
         writer: writer,
         useColors: true,
       });
-      initializeContext(replServer.context);
-      replServer.on("reset", initializeContext);
+      initializeFunctionsShellContext(replServer.context, emulator);
+      replServer.on("reset", (context) => initializeFunctionsShellContext(context, emulator));
 
       return new Promise((resolve) => {
         replServer.on("exit", () => {
           return serveFunctions.stop().then(resolve).catch(resolve);
         });
       });

src/gcp/cloudfunctionsv2.spec.ts

@@ -314,7 +314,7 @@
           serviceConfig: {
             ...HAVE_CLOUD_FUNCTION_V2.serviceConfig,
             directVpcNetworkInterface: [{ network: "my-net" }],
             directVpcEgress: "ALL_TRAFFIC" as any,
             uri: RUN_URI,
             service: "service",
           },
@@ -328,7 +328,7 @@
         serviceConfig: {
           ...HAVE_CLOUD_FUNCTION_V2.serviceConfig,
           directVpcNetworkInterface: [{ network: "my-net" }],
           directVpcEgress: "VPC_EGRESS_UNSPECIFIED" as any,
           uri: RUN_URI,
           service: "service",
         },
@@ -925,6 +925,31 @@
       await cloudfunctionsv2.createFunction(testFunction);
       expect(scope.isDone()).to.be.true;
     });
+
+    it("should preserve a hyphenated entry point in FUNCTION_TARGET", async () => {
+      const testFunction = {
+        ...CLOUD_FUNCTION_V2,
+        buildConfig: {
+          ...CLOUD_FUNCTION_V2.buildConfig,
+          entryPoint: "dummystore-bot",
+          environmentVariables: {},
+        },
+      };
+
+      const scope = nock(functionsV2Origin())
+        .post("/v2/projects/project/locations/region/functions", (body) => {
+          expect(body.serviceConfig.environmentVariables).to.have.property(
+            "FUNCTION_TARGET",
+            "dummystore-bot",
+          );
+          return true;
+        })
+        .query({ functionId: "id" })
+        .reply(200, { name: "operations/123", done: true });
+
+      await cloudfunctionsv2.createFunction(testFunction);
+      expect(scope.isDone()).to.be.true;
+    });
   });
 
   describe("updateFunction", () => {
@@ -951,5 +976,30 @@
       await cloudfunctionsv2.updateFunction(CLOUD_FUNCTION_V2);
       expect(scope.isDone()).to.be.true;
     });
+
+    it("should preserve a hyphenated entry point in FUNCTION_TARGET", async () => {
+      const testFunction = {
+        ...CLOUD_FUNCTION_V2,
+        buildConfig: {
+          ...CLOUD_FUNCTION_V2.buildConfig,
+          entryPoint: "dummystore-bot",
+          environmentVariables: {},
+        },
+      };
+
+      const scope = nock(functionsV2Origin())
+        .patch("/v2/projects/project/locations/region/functions/id", (body) => {
+          expect(body.serviceConfig.environmentVariables).to.have.property(
+            "FUNCTION_TARGET",
+            "dummystore-bot",
+          );
+          return true;
+        })
+        .query(true)
+        .reply(200, { name: "operations/123", done: true });
+
+      await cloudfunctionsv2.updateFunction(testFunction);
+      expect(scope.isDone()).to.be.true;
+    });
   });
 });

src/gcp/cloudfunctionsv2.ts

@@ -312,7 +312,7 @@ export async function createFunction(cloudFunction: InputCloudFunction): Promise
 
   cloudFunction.serviceConfig.environmentVariables = {
     ...cloudFunction.serviceConfig.environmentVariables,
-    FUNCTION_TARGET: cloudFunction.buildConfig.entryPoint.replaceAll("-", "."),
+    FUNCTION_TARGET: cloudFunction.buildConfig.entryPoint,
     // Enable logging execution id by default for better debugging
     LOG_EXECUTION_ID: "true",
   };
@@ -394,7 +394,7 @@ export async function updateFunction(cloudFunction: InputCloudFunction): Promise
   };
   cloudFunction.serviceConfig.environmentVariables = {
     ...cloudFunction.serviceConfig.environmentVariables,
-    FUNCTION_TARGET: cloudFunction.buildConfig.entryPoint.replaceAll("-", "."),
+    FUNCTION_TARGET: cloudFunction.buildConfig.entryPoint,
     // Enable logging execution id by default for better debugging
     LOG_EXECUTION_ID: "true",
   };