@netlify/zip-it-and-ship-it 16.2.2 → 16.2.3

package/dist/config.d.ts

@@ -51,4 +51,5 @@ declare const getConfigForFunction: ({ config, configFileDirectories, func, }: {
     configFileDirectories?: string[];
     func: FunctionWithoutConfig;
 }) => Promise<FunctionConfig>;
+export declare const withComputeResources: <T extends FunctionConfig>(merged: T, sources: Pick<FunctionConfig, "memory" | "vcpu">[]) => T;
 export { Config, FunctionConfig, FunctionWithoutConfig, getConfigForFunction };

package/dist/config.js

@@ -75,10 +75,10 @@ const getConfigForFunction = async ({ config, configFileDirectories, func, }) =>
         return fromConfig;
     }
     const fromFile = await getFromFile(func);
-    return {
+    return withComputeResources({
         ...fromConfig,
         ...fromFile,
-    };
+    }, [fromConfig, fromFile]);
 };
 const getFromMainConfig = ({ config, func, }) => {
     if (!config) {
@@ -101,7 +101,29 @@ const getFromMainConfig = ({ config, func, }) => {
     })
         .sort(({ weight: weightA }, { weight: weightB }) => weightA - weightB)
         .map(({ expression }) => config[expression]);
-    return mergeOptions.apply({ concatArrays: true, ignoreUndefined: true }, matches);
+    const merged = withComputeResources(mergeOptions.apply({ concatArrays: true, ignoreUndefined: true }, matches), matches);
+    const memory = merged.memory;
+    if (typeof memory === 'string') {
+        merged.memory = parseMemoryMB(memory);
+    }
+    return merged;
+};
+// memory and vcpu are two mutually exclusive ways of sizing a function, so
+// they can't be merged key by key like other properties
+// a wildcard block with memory and a more specific block with vcpu
+// would otherwise produce both. Instead, the highest-priority source that
+// sets either of them supplies the pair.
+export const withComputeResources = (merged, sources) => {
+    const winner = [...sources].reverse().find((source) => source.memory !== undefined || source.vcpu !== undefined);
+    if (winner === undefined) {
+        return merged;
+    }
+    const { memory, vcpu, ...rest } = merged;
+    return {
+        ...rest,
+        ...(winner.memory === undefined ? {} : { memory: winner.memory }),
+        ...(winner.vcpu === undefined ? {} : { vcpu: winner.vcpu }),
+    };
 };
 const getFromFile = async (func) => {
     const filename = `${basename(func.mainFile, extname(func.mainFile))}.json`;

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

@@ -3,7 +3,7 @@ import { dirname } from 'path';
 // this dependency.
 import mergeOptions from 'merge-options';
 import { z } from 'zod';
-import { functionConfigShape } from '../../../config.js';
+import { functionConfigShape, withComputeResources } from '../../../config.js';
 import { INVOCATION_MODE } from '../../../function.js';
 import { rateLimit } from '../../../rate_limit.js';
 import { ensureArray } from '../../../utils/ensure_array.js';
@@ -257,7 +257,7 @@ export const parseSource = (source, { functionName }) => {
     return result;
 };
 export const augmentFunctionConfig = (mainFile, tomlConfig, inSourceConfig = {}) => {
-    const mergedConfig = mergeOptions.call({ concatArrays: true }, tomlConfig, inSourceConfig);
+    const mergedConfig = withComputeResources(mergeOptions.call({ concatArrays: true }, tomlConfig, inSourceConfig), [tomlConfig, inSourceConfig]);
     // We can't simply merge included files from the TOML and from in-source
     // configuration because their globs are relative to different base paths.
     // In the future, we could shift things around so we resolve each glob

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "16.2.2",
+  "version": "16.2.3",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "type": "module",
@@ -100,5 +100,5 @@
   "engines": {
     "node": ">=22.12.0"
   },
-  "gitHead": "9b3697b13c8c2294c30810b14a7ef9b8fd9e2bcd"
+  "gitHead": "227492a17c9821682390f6b7554bd69dfa282d9e"
 }