fix: refresh images in dev mode when they change

.changeset/real-insects-greet.md

@@ -0,0 +1,5 @@
+---
+'imagetools-core': major
+---
+
+breaking: remove utils

.changeset/silent-cougars-wave.md

@@ -0,0 +1,5 @@
+---
+'vite-imagetools': patch
+---
+
+fix: refresh images in dev mode when they change

packages/core/src/index.ts

@@ -22,7 +22,6 @@ export * from './transforms/tint.js'
 export * from './types.js'
 export * from './builtins.js'
 export * from './output-formats.js'
-export * from './util.js'
 export { parseURL, extractEntries } from './lib/parse-url.js'
 export { resolveConfigs } from './lib/resolve-configs.js'
 export { generateTransforms } from './lib/generate-transforms.js'

packages/vite/src/index.ts

@@ -5,10 +5,8 @@ import {
   builtins,
   builtinOutputFormats,
   extractEntries,
-  generateImageID,
   generateTransforms,
   getMetadata,
-  loadImage,
   parseURL,
   urlFormat,
   resolveConfigs,
@@ -17,8 +15,8 @@ import {
   type ProcessedImageMetadata
 } from 'imagetools-core'
 import { createFilter, dataToEsm } from '@rollup/pluginutils'
-import type { Metadata, Sharp } from 'sharp'
-import { createBasePath } from './utils.js'
+import sharp, { type Metadata, type Sharp } from 'sharp'
+import { createBasePath, generateImageID } from './utils.js'
 import type { VitePluginOptions } from './types.js'
 
 export type {
@@ -53,7 +51,7 @@ export function imagetools(userOptions: Partial<VitePluginOptions> = {}): Plugin
   let viteConfig: ResolvedConfig
   let basePath: string
 
-  const generatedImages = new Map()
+  const generatedImages = new Map<string, Sharp>()
 
   return {
     name: 'imagetools',
@@ -72,7 +70,7 @@ export function imagetools(userOptions: Partial<VitePluginOptions> = {}): Plugin
       let lazyImg: Sharp
       const lazyLoadImage = () => {
         if (lazyImg) return lazyImg
-        return (lazyImg = loadImage(decodeURIComponent(srcURL.pathname)))
+        return (lazyImg = sharp(decodeURIComponent(srcURL.pathname)))
       }
 
       let lazyMetadata: Metadata
@@ -128,7 +126,7 @@ export function imagetools(userOptions: Partial<VitePluginOptions> = {}): Plugin
         const { image, metadata } = await applyTransforms(transforms, img.clone(), pluginOptions.removeMetadata)
 
         if (viteConfig.command === 'serve') {
-          const id = generateImageID(srcURL, config)
+          const id = await generateImageID(srcURL, config, img)
           generatedImages.set(id, image)
           metadata.src = basePath + id
         } else {

packages/vite/src/utils.ts

@@ -1,3 +1,31 @@
+import { createHash } from 'node:crypto'
+import path from 'node:path'
+import { stat } from 'node:fs/promises'
+import { ImageConfig } from 'imagetools-core'
+import { Sharp } from 'sharp'
+
 export const createBasePath = (base?: string) => {
   return (base?.replace(/\/$/, '') || '') + '/@imagetools/'
 }
+
+export async function generateImageID(url: URL, config: ImageConfig, originalImage: Sharp) {
+  if (url.host) {
+    const baseURL = new URL(url.origin + url.pathname)
+    const buffer = await originalImage.toBuffer()
+    return hash([baseURL.href, JSON.stringify(config), buffer])
+  }
+
+  // baseURL isn't a valid URL, but just a string used for an identifier
+  // use a relative path in the local case so that it's consistent across machines
+  const baseURL = new URL(url.protocol + path.relative(process.cwd(), url.pathname))
+  const { mtime } = (await stat(path.resolve(process.cwd(), url.pathname)))
+  return hash([baseURL.href, JSON.stringify(config), mtime.getTime().toString()])
+}
+
+function hash(keyParts: Array<string | NodeJS.ArrayBufferView>) {
+  let hash = createHash('sha1');
+  for (const keyPart of keyParts) {
+    hash = hash.update(keyPart)
+  }
+  return hash.digest('hex')
+}