refactor: use memoize and MemoizeCache from @netlify/dev-utils

src/lib/functions/netlify-function.ts

@@ -3,6 +3,7 @@ import { basename, extname } from 'path'
 import { version as nodeVersion } from 'process'
 
 import type { ExtendedRoute, Route } from '@netlify/zip-it-and-ship-it'
+import type { MemoizeCache } from '@netlify/dev-utils'
 import CronParser from 'cron-parser'
 import semver from 'semver'
 
@@ -12,7 +13,6 @@ import { type BlobsContextWithEdgeAccess, getBlobsEventProperty } from '../blobs
 import type { ServerSettings } from '../../utils/types.js'
 
 import type { BaseBuildResult, InvokeFunctionResult, Runtime } from './runtimes/index.js'
-import type { BuildCommandCache } from './memoized-build.js'
 
 export interface InvocationError {
   errorMessage: string
@@ -181,7 +181,7 @@ export default class NetlifyFunction<BuildResult extends BaseBuildResult> {
   //
   // - `srcFilesDiff`: Files that were added and removed since the last time
   //    the function was built.
-  async build({ cache }: { cache?: BuildCommandCache<Record<string, unknown>> }) {
+  async build({ cache }: { cache?: MemoizeCache<Record<string, unknown>> }) {
     const buildFunction = await this.runtime.getBuildFunction({
       config: this.config,
       directory: this.directory,

src/lib/functions/registry.ts

@@ -4,6 +4,7 @@ import { basename, extname, isAbsolute, join, resolve } from 'path'
 import { env } from 'process'
 
 import { type ListedFunction, listFunctions, type Manifest } from '@netlify/zip-it-and-ship-it'
+import type { MemoizeCache } from '@netlify/dev-utils'
 import extractZip from 'extract-zip'
 
 import {
@@ -26,7 +27,6 @@ import type { ServerSettings } from '../../utils/types.js'
 
 import NetlifyFunction from './netlify-function.js'
 import runtimes, { type BaseBuildResult } from './runtimes/index.js'
-import type { BuildCommandCache } from './memoized-build.js'
 
 export const DEFAULT_FUNCTION_URL_EXPRESSION = /^\/.netlify\/(functions|builders)\/([^/]+).*/
 const TYPES_PACKAGE = '@netlify/functions'
@@ -67,7 +67,7 @@ export class FunctionsRegistry {
    */
   private blobsContext: BlobsContextWithEdgeAccess
 
-  private buildCommandCache?: BuildCommandCache<Record<string, unknown>>
+  private buildCommandCache?: MemoizeCache<Record<string, unknown>>
   private capabilities: {
     backgroundFunctions?: boolean
   }

src/lib/functions/runtimes/index.ts

@@ -1,6 +1,6 @@
 import type { ExtendedRoute, Route } from '@netlify/zip-it-and-ship-it'
+import type { MemoizeCache } from '@netlify/dev-utils'
 
-import type { BuildCommandCache } from '../memoized-build.js'
 import type NetlifyFunction from '../netlify-function.js'
 import type { NormalizedCachedConfigConfig } from '../../../utils/command-helpers.js'
 
@@ -37,7 +37,7 @@ export type GetBuildFunctionOpts<BuildResult extends BaseBuildResult> = {
 export type BuildFunction<
   BuildResult extends BaseBuildResult,
   CacheEntry extends Record<string, unknown> = Record<string, unknown>,
-> = ({ cache }: { cache?: BuildCommandCache<CacheEntry> }) => Promise<BuildResult>
+> = ({ cache }: { cache?: MemoizeCache<CacheEntry> }) => Promise<BuildResult>
 export type GetBuildFunction<
   BuildResult extends BaseBuildResult,
   CacheEntry extends Record<string, unknown> = Record<string, unknown>,

src/lib/functions/runtimes/js/builders/zisi.ts

@@ -5,6 +5,7 @@ import path from 'path'
 import { ARCHIVE_FORMAT, zipFunction, listFunction, type FunctionResult } from '@netlify/zip-it-and-ship-it'
 // TODO(serhalp): Export this type from zisi
 import type { FeatureFlags } from '@netlify/zip-it-and-ship-it/dist/feature_flags.js'
+import { type MemoizeCache, memoize } from '@netlify/dev-utils'
 import decache from 'decache'
 import { readPackageUp } from 'read-package-up'
 import sourceMapSupport from 'source-map-support'
@@ -13,7 +14,6 @@ import { NETLIFYDEVERR, type NormalizedCachedConfigConfig } from '../../../../..
 import { SERVE_FUNCTIONS_FOLDER } from '../../../../../utils/functions/functions.js'
 import { getPathInProject } from '../../../../settings.js'
 import { type NormalizedFunctionsConfig, normalizeFunctionsConfig } from '../../../config.js'
-import { type BuildCommandCache, memoizedBuild } from '../../../memoized-build.js'
 import type NetlifyFunction from '../../../netlify-function.js'
 import type { BaseBuildResult } from '../../index.js'
 import type { JsBuildResult } from '../index.js'
@@ -46,7 +46,7 @@ const buildFunction = async ({
   projectRoot,
   targetDirectory,
 }: {
-  cache: BuildCommandCache<FunctionResult>
+  cache: MemoizeCache<FunctionResult>
   config: NormalizedFunctionsConfig
   directory?: string | undefined
   featureFlags: FeatureFlags
@@ -84,7 +84,7 @@ const buildFunction = async ({
     routes,
     runtimeAPIVersion,
     schedule,
-  } = await memoizedBuild({
+  } = await memoize({
     cache,
     cacheKey: `zisi-${entryPath}`,
     command: async () => {
@@ -229,7 +229,7 @@ export default async function detectZisiBuilder({
 
   const targetDirectory = await getTargetDirectory({ projectRoot, errorExit })
 
-  const build = async ({ cache = {} }: { cache?: BuildCommandCache<FunctionResult> }) =>
+  const build = async ({ cache = {} }: { cache?: MemoizeCache<FunctionResult> }) =>
     buildFunction({
       cache,
       config: functionsConfig,