@netlify/zip-it-and-ship-it 14.4.2 → 14.5.0

package/dist/manifest.d.ts

@@ -6,6 +6,7 @@ interface ManifestFunction {
     buildData?: Record<string, unknown>;
     bundler?: string;
     displayName?: string;
+    eventSubscriptions?: string[];
     excludedRoutes?: Route[];
     generator?: string;
     invocationMode?: InvocationMode;

package/dist/manifest.js

@@ -12,7 +12,7 @@ export const createManifest = async ({ functions, path }) => {
     };
     await fs.writeFile(path, JSON.stringify(payload));
 };
-const formatFunctionForManifest = ({ bootstrapVersion, bundler, displayName, excludedRoutes, generator, invocationMode, mainFile, name, path, priority, trafficRules, routes, runtime, runtimeVersion, runtimeAPIVersion, schedule, timeout, }) => {
+const formatFunctionForManifest = ({ bootstrapVersion, bundler, displayName, eventSubscriptions, excludedRoutes, generator, invocationMode, mainFile, name, path, priority, trafficRules, routes, runtime, runtimeVersion, runtimeAPIVersion, schedule, timeout, }) => {
     const manifestFunction = {
         bundler,
         displayName,
@@ -29,6 +29,9 @@ const formatFunctionForManifest = ({ bootstrapVersion, bundler, displayName, exc
         runtime,
         schedule,
     };
+    if (eventSubscriptions?.length) {
+        manifestFunction.eventSubscriptions = eventSubscriptions;
+    }
     if (routes?.length !== 0) {
         manifestFunction.routes = routes;
     }

package/dist/runtimes/node/in_source_config/index.d.ts

@@ -7,6 +7,7 @@ import type { ModuleFormat } from '../utils/module_format.js';
 export declare const IN_SOURCE_CONFIG_MODULE = "@netlify/functions";
 export interface StaticAnalysisResult {
     config: InSourceConfig;
+    eventSubscriptions?: string[];
     excludedRoutes?: Route[];
     inputModuleFormat?: ModuleFormat;
     invocationMode?: InvocationMode;

package/dist/runtimes/node/in_source_config/index.js

@@ -14,6 +14,7 @@ import { createBindingsMethod } from '../parser/bindings.js';
 import { traverseNodes } from '../parser/exports.js';
 import { getImports } from '../parser/imports.js';
 import { safelyParseSource, safelyReadSource } from '../parser/index.js';
+import { eventHandlers } from '@netlify/serverless-functions-api';
 import { parse as parseSchedule } from './properties/schedule.js';
 export const IN_SOURCE_CONFIG_MODULE = '@netlify/functions';
 const httpMethod = z.enum(['GET', 'POST', 'PUT', 'PATCH', 'OPTIONS', 'DELETE', 'HEAD']);
@@ -49,6 +50,37 @@ export const inSourceConfig = functionConfig
     preferStatic: z.boolean().optional().catch(undefined),
     rateLimit: rateLimit.optional().catch(undefined),
 });
+/**
+ * Extracts event subscription slugs from the default export expression,
+ * if it's an object whose property names match known event handlers.
+ */
+const getEventSubscriptions = (expression, getAllBindings) => {
+    let objectExpression;
+    if (expression?.type === 'ObjectExpression') {
+        objectExpression = expression;
+    }
+    else if (expression?.type === 'Identifier') {
+        const binding = getAllBindings().get(expression.name);
+        if (binding?.type === 'ObjectExpression') {
+            objectExpression = binding;
+        }
+    }
+    if (!objectExpression) {
+        return [];
+    }
+    const events = [];
+    for (const property of objectExpression.properties) {
+        let name;
+        if ((property.type === 'ObjectMethod' || property.type === 'ObjectProperty') &&
+            property.key.type === 'Identifier') {
+            name = property.key.name;
+        }
+        if (name && name in eventHandlers) {
+            events.push(eventHandlers[name]);
+        }
+    }
+    return events;
+};
 const validateScheduleFunction = (functionFound, scheduleFound, functionName) => {
     if (!functionFound) {
         throw new FunctionBundlingUserError("The `schedule` helper was imported but we couldn't find any usages. If you meant to schedule a function, please check that `schedule` is invoked and `handler` correctly exported.", { functionName, runtime: RUNTIME.JAVASCRIPT });
@@ -87,7 +119,7 @@ export const parseSource = (source, { functionName }) => {
     let scheduledFunctionFound = false;
     let scheduleFound = false;
     const getAllBindings = createBindingsMethod(ast.body);
-    const { configExport, handlerExports, hasDefaultExport, inputModuleFormat } = traverseNodes(ast.body, getAllBindings);
+    const { configExport, handlerExports, hasDefaultExport, defaultExportExpression, inputModuleFormat } = traverseNodes(ast.body, getAllBindings);
     const isV2API = handlerExports.length === 0 && hasDefaultExport;
     if (isV2API) {
         const result = {
@@ -95,6 +127,10 @@ export const parseSource = (source, { functionName }) => {
             inputModuleFormat,
             runtimeAPIVersion: 2,
         };
+        const eventSubscriptions = getEventSubscriptions(defaultExportExpression, getAllBindings);
+        if (eventSubscriptions.length > 0) {
+            result.eventSubscriptions = eventSubscriptions;
+        }
         const { data, error, success } = inSourceConfig.safeParse(configExport);
         if (success) {
             result.config = data;

package/dist/runtimes/node/parser/exports.d.ts

@@ -1,4 +1,4 @@
-import type { Statement } from '@babel/types';
+import type { Declaration, Expression, Statement } from '@babel/types';
 import type { ISCExport } from '../in_source_config/index.js';
 import type { BindingMethod } from './bindings.js';
 /**
@@ -14,5 +14,6 @@ export declare const traverseNodes: (nodes: Statement[], getAllBindings: Binding
     configExport: Record<string, unknown>;
     handlerExports: ISCExport[];
     hasDefaultExport: boolean;
+    defaultExportExpression: Expression | Declaration | undefined;
     inputModuleFormat: "cjs";
 };

package/dist/runtimes/node/parser/exports.js

@@ -13,6 +13,7 @@ export const traverseNodes = (nodes, getAllBindings) => {
     const handlerExports = [];
     let configExport = {};
     let hasDefaultExport = false;
+    let defaultExportExpression;
     let inputModuleFormat = MODULE_FORMAT.COMMONJS;
     nodes.forEach((node) => {
         if (isESMImportExport(node)) {
@@ -39,10 +40,18 @@ export const traverseNodes = (nodes, getAllBindings) => {
         const cjsDefaultExports = getCJSExports(node, 'default');
         if (cjsDefaultExports.length !== 0) {
             hasDefaultExport = true;
+            defaultExportExpression = getCJSDefaultExpression(node);
             return;
         }
-        if (isESMDefaultExport(node)) {
+        if (node.type === 'ExportDefaultDeclaration') {
             hasDefaultExport = true;
+            defaultExportExpression = node.declaration;
+            return;
+        }
+        if (node.type === 'ExportNamedDeclaration' &&
+            node.specifiers.some((exportSpecifier) => exportSpecifier.exported.type === 'Identifier' && exportSpecifier.exported.name === 'default')) {
+            hasDefaultExport = true;
+            defaultExportExpression = getESMReexportedDefaultExpression(node, getAllBindings);
         }
         const esmConfig = parseConfigESMExport(node);
         if (esmConfig !== undefined) {
@@ -54,7 +63,7 @@ export const traverseNodes = (nodes, getAllBindings) => {
             configExport = cjsConfigExports[0].object;
         }
     });
-    return { configExport, handlerExports, hasDefaultExport, inputModuleFormat };
+    return { configExport, handlerExports, hasDefaultExport, defaultExportExpression, inputModuleFormat };
 };
 // Finds the main handler export in a CJS AST.
 const getCJSExports = (node, name) => {
@@ -112,10 +121,6 @@ const isNamedExport = (node, name) => {
         ((exported.type === 'Identifier' && exported.name === name) ||
             (exported.type === 'StringLiteral' && exported.value === name)));
 };
-// Returns whether a given node is or contains a default export declaration.
-const isESMDefaultExport = (node) => node.type === 'ExportDefaultDeclaration' ||
-    (node.type === 'ExportNamedDeclaration' &&
-        node.specifiers.some((exportSpecifier) => exportSpecifier.exported.type === 'Identifier' && exportSpecifier.exported.name === 'default'));
 /**
  * Finds a `config` named CJS export that maps to an object variable
  * declaration, like:
@@ -213,6 +218,22 @@ const getExportsFromBindings = (specifiers, name, getAllBindings) => {
     const exports = getExportsFromExpression(binding);
     return exports;
 };
+// Extracts the right-hand side expression from a CJS default export
+// (e.g. `exports.default = expr` or `module.exports.default = expr`).
+const getCJSDefaultExpression = (node) => {
+    if (node.type === 'ExpressionStatement' && node.expression.type === 'AssignmentExpression' && node.expression.right) {
+        return node.expression.right;
+    }
+    return undefined;
+};
+// Resolves the expression for `export { x as default }` by looking up `x` in bindings.
+const getESMReexportedDefaultExpression = (node, getAllBindings) => {
+    const defaultSpecifier = node.specifiers.find((spec) => spec.type === 'ExportSpecifier' && spec.exported.type === 'Identifier' && spec.exported.name === 'default');
+    if (defaultSpecifier && defaultSpecifier.type === 'ExportSpecifier') {
+        return getAllBindings().get(defaultSpecifier.local.name);
+    }
+    return undefined;
+};
 const getExportsFromExpression = (node) => {
     switch (node?.type) {
         case 'CallExpression': {

package/dist/utils/format_result.d.ts

@@ -3,6 +3,7 @@ import { RuntimeName } from '../runtimes/runtime.js';
 import type { ExtendedRoute, Route } from './routes.js';
 export type FunctionResult = Omit<FunctionArchive, 'runtime'> & {
     bootstrapVersion?: string;
+    eventSubscriptions?: string[];
     routes?: ExtendedRoute[];
     excludedRoutes?: Route[];
     runtime: RuntimeName;

package/dist/utils/format_result.js

@@ -4,6 +4,7 @@ export const formatZipResult = (archive) => {
     const functionResult = {
         ...archive,
         staticAnalysisResult: undefined,
+        eventSubscriptions: archive.staticAnalysisResult?.eventSubscriptions,
         routes: archive.staticAnalysisResult?.routes,
         excludedRoutes: archive.staticAnalysisResult?.excludedRoutes,
         runtime: archive.runtime.name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "14.4.2",
+  "version": "14.5.0",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "type": "module",
@@ -44,7 +44,7 @@
     "@babel/parser": "^7.22.5",
     "@babel/types": "^7.28.5",
     "@netlify/binary-info": "^1.0.0",
-    "@netlify/serverless-functions-api": "^2.10.0",
+    "@netlify/serverless-functions-api": "2.11.1",
     "@vercel/nft": "0.29.4",
     "archiver": "^7.0.0",
     "common-path-prefix": "^3.0.0",
@@ -99,5 +99,5 @@
   "engines": {
     "node": ">=18.14.0"
   },
-  "gitHead": "0ddf077b1055b90e13b678c3516afc0dfdb9c76d"
+  "gitHead": "5163296011af5d699885acf2c8bca82a4458ab31"
 }