@netlify/edge-bundler 4.2.0 → 4.3.0

package/deno/config.ts

@@ -11,6 +11,10 @@ try {
   Deno.exit(exitCodes.ImportError)
 }
 
+if (typeof func.default !== 'function') {
+  Deno.exit(exitCodes.InvalidDefaultExport)
+}
+
 if (func.config === undefined) {
   Deno.exit(exitCodes.NoConfig)
 }

package/dist/node/config.js

@@ -12,6 +12,7 @@ var ConfigExitCode;
     ConfigExitCode[ConfigExitCode["InvalidExport"] = 4] = "InvalidExport";
     ConfigExitCode[ConfigExitCode["RuntimeError"] = 5] = "RuntimeError";
     ConfigExitCode[ConfigExitCode["SerializationError"] = 6] = "SerializationError";
+    ConfigExitCode[ConfigExitCode["InvalidDefaultExport"] = 7] = "InvalidDefaultExport";
 })(ConfigExitCode || (ConfigExitCode = {}));
 const getConfigExtractor = () => {
     const packagePath = getPackagePath();
@@ -82,6 +83,8 @@ const logConfigError = (func, exitCode, stderr, log) => {
         case ConfigExitCode.SerializationError:
             log.user(`'config' function in edge function at '${func.path}' must return an object with primitive values only`);
             break;
+        case ConfigExitCode.InvalidDefaultExport:
+            throw new Error(`Default export in '${func.path}' must be a function. More on the Edge Functions API at https://ntl.fyi/edge-api.`);
         default:
             log.user(`Could not load configuration for edge function at '${func.path}'`);
             log.user(stderr);

package/dist/node/config.test.js

@@ -15,6 +15,7 @@ const importMapFile = {
         'alias:helper': pathToFileURL(join(fixturesDir, 'helper.ts')).toString(),
     },
 };
+const invalidDefaultExportErr = (path) => `Default export in '${path}' must be a function. More on the Edge Functions API at https://ntl.fyi/edge-api.`;
 test('`getFunctionConfig` extracts configuration properties from function file', async () => {
     const { path: tmpDir } = await tmp.dir();
     const deno = new DenoBridge({
@@ -184,3 +185,78 @@ test('Loads function paths from the in-source `config` function', async () => {
     expect(postCacheRoutes[0]).toEqual({ function: 'user-func4', pattern: '^/user-func4/?$' });
     await fs.rmdir(tmpDir.path, { recursive: true });
 });
+test('Passes validation if default export exists and is a function', async () => {
+    const { path: tmpDir } = await tmp.dir();
+    const deno = new DenoBridge({
+        cacheDirectory: tmpDir,
+    });
+    const func = {
+        name: 'func1',
+        source: `
+        const func = () => new Response("Hello world!")
+        export default func
+      `,
+    };
+    const logger = {
+        user: vi.fn().mockResolvedValue(null),
+        system: vi.fn().mockResolvedValue(null),
+    };
+    const path = join(tmpDir, `${func.name}.ts`);
+    await fs.writeFile(path, func.source);
+    expect(async () => {
+        await getFunctionConfig({
+            name: func.name,
+            path,
+        }, new ImportMap([importMapFile]), deno, logger);
+    }).not.toThrow();
+    await deleteAsync(tmpDir, { force: true });
+});
+test('Fails validation if default export is not function', async () => {
+    const { path: tmpDir } = await tmp.dir();
+    const deno = new DenoBridge({
+        cacheDirectory: tmpDir,
+    });
+    const func = {
+        name: 'func2',
+        source: `
+        const func = new Response("Hello world!")
+        export default func
+      `,
+    };
+    const logger = {
+        user: vi.fn().mockResolvedValue(null),
+        system: vi.fn().mockResolvedValue(null),
+    };
+    const path = join(tmpDir, `${func.name}.ts`);
+    await fs.writeFile(path, func.source);
+    const config = getFunctionConfig({
+        name: func.name,
+        path,
+    }, new ImportMap([importMapFile]), deno, logger);
+    await expect(config).rejects.toThrowError(invalidDefaultExportErr(path));
+    await deleteAsync(tmpDir, { force: true });
+});
+test('Fails validation if default export is not present', async () => {
+    const { path: tmpDir } = await tmp.dir();
+    const deno = new DenoBridge({
+        cacheDirectory: tmpDir,
+    });
+    const func = {
+        name: 'func3',
+        source: `
+        export const func = () => new Response("Hello world!")
+      `,
+    };
+    const logger = {
+        user: vi.fn().mockResolvedValue(null),
+        system: vi.fn().mockResolvedValue(null),
+    };
+    const path = join(tmpDir, `${func.name}.ts`);
+    await fs.writeFile(path, func.source);
+    const config = getFunctionConfig({
+        name: func.name,
+        path,
+    }, new ImportMap([importMapFile]), deno, logger);
+    await expect(config).rejects.toThrowError(invalidDefaultExportErr(path));
+    await deleteAsync(tmpDir, { force: true });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",