@gallop.software/studio 1.0.6 → 1.2.0

package/dist/{chunk-FDWPNRNZ.mjs → chunk-VQJAJVAQ.mjs}

@@ -19,9 +19,14 @@ function getAllThumbnailPaths(originalPath) {
     getThumbnailPath(originalPath, "sm")
   ];
 }
+function isProcessed(entry) {
+  if (!entry) return false;
+  return !!(entry.f || entry.lg || entry.md || entry.sm);
+}
 
 export {
   getThumbnailPath,
-  getAllThumbnailPaths
+  getAllThumbnailPaths,
+  isProcessed
 };
-//# sourceMappingURL=chunk-FDWPNRNZ.mjs.map
+//# sourceMappingURL=chunk-VQJAJVAQ.mjs.map

package/dist/chunk-VQJAJVAQ.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/types.ts"],"sourcesContent":["/**\n * Dimensions object {w, h}\n */\nexport interface Dimensions {\n  w: number\n  h: number\n}\n\n/**\n * Meta entry - works for images and non-images\n * o: original dimensions, b: blurhash, c: CDN index\n * sm/md/lg/f: thumbnail dimensions (presence implies processed)\n */\nexport interface MetaEntry {\n  o?: Dimensions   // original dimensions {w, h}\n  b?: string       // blurhash\n  sm?: Dimensions  // small thumbnail (300px width)\n  md?: Dimensions  // medium thumbnail (700px width)\n  lg?: Dimensions  // large thumbnail (1400px width)\n  f?: Dimensions   // full size (capped at 2560px width)\n  c?: number       // CDN index - index into _cdns array\n}\n\n/**\n * Full meta schema including special keys\n * _cdns: Array of CDN base URLs\n * Other keys: file paths from public folder\n */\nexport interface FullMeta {\n  _cdns?: string[]  // Array of CDN base URLs\n  [key: string]: MetaEntry | string[] | undefined\n}\n\n/**\n * Meta schema - keyed by path from public folder\n * Example: { \"/portfolio/photo.jpg\": { o: {w:2400,h:1600}, b: \"...\", sm: {w:300,h:200}, ... } }\n */\nexport type LeanMeta = Record<string, MetaEntry>\n\n// Alias for compatibility\nexport type LeanImageEntry = MetaEntry\n\n/**\n * File/folder item for browser\n */\nexport interface FileItem {\n  name: string\n  path: string\n  type: 'file' | 'folder'\n  size?: number\n  dimensions?: { width: number; height: number }\n  isProcessed?: boolean\n  cdnPushed?: boolean\n  cdnBaseUrl?: string  // CDN base URL when pushed to cloud\n  isRemote?: boolean   // true if CDN URL doesn't match R2 (external import)\n  isProtected?: boolean // true for images folder and its contents (cannot select/modify)\n  // Folder-specific properties\n  fileCount?: number\n  totalSize?: number\n  // For showing thumbnails - path to -sm version if exists\n  thumbnail?: string\n  // Whether a processed thumbnail exists\n  hasThumbnail?: boolean\n}\n\n/**\n * Studio configuration\n */\nexport interface StudioConfig {\n  r2AccountId?: string\n  r2AccessKeyId?: string\n  r2SecretAccessKey?: string\n  r2BucketName?: string\n  r2PublicUrl?: string\n  thumbnailSizes?: {\n    small: number\n    medium: number\n    large: number\n  }\n}\n\n/**\n * Get thumbnail path from original image path\n */\nexport function getThumbnailPath(originalPath: string, size: 'sm' | 'md' | 'lg' | 'full'): string {\n  if (size === 'full') {\n    const ext = originalPath.match(/\\.\\w+$/)?.[0] || '.jpg'\n    const base = originalPath.replace(/\\.\\w+$/, '')\n    const outputExt = ext.toLowerCase() === '.png' ? '.png' : '.jpg'\n    return `/images${base}${outputExt}`\n  }\n  const ext = originalPath.match(/\\.\\w+$/)?.[0] || '.jpg'\n  const base = originalPath.replace(/\\.\\w+$/, '')\n  const outputExt = ext.toLowerCase() === '.png' ? '.png' : '.jpg'\n  return `/images${base}-${size}${outputExt}`\n}\n\n/**\n * Get all thumbnail paths for an image\n */\nexport function getAllThumbnailPaths(originalPath: string): string[] {\n  return [\n    getThumbnailPath(originalPath, 'full'),\n    getThumbnailPath(originalPath, 'lg'),\n    getThumbnailPath(originalPath, 'md'),\n    getThumbnailPath(originalPath, 'sm'),\n  ]\n}\n\n/**\n * Check if an image entry is processed (has any thumbnail dimensions)\n */\nexport function isProcessed(entry: MetaEntry | undefined): boolean {\n  if (!entry) return false\n  return !!(entry.f || entry.lg || entry.md || entry.sm)\n}\n"],"mappings":";AAoFO,SAAS,iBAAiB,cAAsB,MAA2C;AAChG,MAAI,SAAS,QAAQ;AACnB,UAAMA,OAAM,aAAa,MAAM,QAAQ,IAAI,CAAC,KAAK;AACjD,UAAMC,QAAO,aAAa,QAAQ,UAAU,EAAE;AAC9C,UAAMC,aAAYF,KAAI,YAAY,MAAM,SAAS,SAAS;AAC1D,WAAO,UAAUC,KAAI,GAAGC,UAAS;AAAA,EACnC;AACA,QAAM,MAAM,aAAa,MAAM,QAAQ,IAAI,CAAC,KAAK;AACjD,QAAM,OAAO,aAAa,QAAQ,UAAU,EAAE;AAC9C,QAAM,YAAY,IAAI,YAAY,MAAM,SAAS,SAAS;AAC1D,SAAO,UAAU,IAAI,IAAI,IAAI,GAAG,SAAS;AAC3C;AAKO,SAAS,qBAAqB,cAAgC;AACnE,SAAO;AAAA,IACL,iBAAiB,cAAc,MAAM;AAAA,IACrC,iBAAiB,cAAc,IAAI;AAAA,IACnC,iBAAiB,cAAc,IAAI;AAAA,IACnC,iBAAiB,cAAc,IAAI;AAAA,EACrC;AACF;AAKO,SAAS,YAAY,OAAuC;AACjE,MAAI,CAAC,MAAO,QAAO;AACnB,SAAO,CAAC,EAAE,MAAM,KAAK,MAAM,MAAM,MAAM,MAAM,MAAM;AACrD;","names":["ext","base","outputExt"]}

package/dist/{chunk-WJJHVPLT.js → chunk-WOHZ4LYG.js}

@@ -19,9 +19,14 @@ function getAllThumbnailPaths(originalPath) {
     getThumbnailPath(originalPath, "sm")
   ];
 }
+function isProcessed(entry) {
+  if (!entry) return false;
+  return !!(entry.f || entry.lg || entry.md || entry.sm);
+}
+
 
 
 
 
-exports.getThumbnailPath = getThumbnailPath; exports.getAllThumbnailPaths = getAllThumbnailPaths;
-//# sourceMappingURL=chunk-WJJHVPLT.js.map
+exports.getThumbnailPath = getThumbnailPath; exports.getAllThumbnailPaths = getAllThumbnailPaths; exports.isProcessed = isProcessed;
+//# sourceMappingURL=chunk-WOHZ4LYG.js.map

package/dist/chunk-WOHZ4LYG.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["/Users/chrisb/Sites/studio/dist/chunk-WOHZ4LYG.js","../src/types.ts"],"names":["ext","base","outputExt"],"mappings":"AAAA;ACoFO,SAAS,gBAAA,CAAiB,YAAA,EAAsB,IAAA,EAA2C;AAChG,EAAA,GAAA,CAAI,KAAA,IAAS,MAAA,EAAQ;AACnB,IAAA,MAAMA,KAAAA,kBAAM,YAAA,mBAAa,KAAA,mBAAM,QAAQ,CAAA,4BAAA,CAAI,CAAC,IAAA,GAAK,MAAA;AACjD,IAAA,MAAMC,MAAAA,EAAO,YAAA,CAAa,OAAA,CAAQ,QAAA,EAAU,EAAE,CAAA;AAC9C,IAAA,MAAMC,WAAAA,EAAYF,IAAAA,CAAI,WAAA,CAAY,EAAA,IAAM,OAAA,EAAS,OAAA,EAAS,MAAA;AAC1D,IAAA,OAAO,CAAA,OAAA,EAAUC,KAAI,CAAA,EAAA;AACvB,EAAA;AACyB,EAAA;AACZ,EAAA;AACS,EAAA;AACG,EAAA;AAC3B;AAKgB;AACP,EAAA;AACY,IAAA;AACA,IAAA;AACA,IAAA;AACA,IAAA;AACnB,EAAA;AACF;AAK4B;AACP,EAAA;AACE,EAAA;AACvB;AD1F2B;AACA;AACA;AACA;AACA;AACA","file":"/Users/chrisb/Sites/studio/dist/chunk-WOHZ4LYG.js","sourcesContent":[null,"/**\n * Dimensions object {w, h}\n */\nexport interface Dimensions {\n  w: number\n  h: number\n}\n\n/**\n * Meta entry - works for images and non-images\n * o: original dimensions, b: blurhash, c: CDN index\n * sm/md/lg/f: thumbnail dimensions (presence implies processed)\n */\nexport interface MetaEntry {\n  o?: Dimensions   // original dimensions {w, h}\n  b?: string       // blurhash\n  sm?: Dimensions  // small thumbnail (300px width)\n  md?: Dimensions  // medium thumbnail (700px width)\n  lg?: Dimensions  // large thumbnail (1400px width)\n  f?: Dimensions   // full size (capped at 2560px width)\n  c?: number       // CDN index - index into _cdns array\n}\n\n/**\n * Full meta schema including special keys\n * _cdns: Array of CDN base URLs\n * Other keys: file paths from public folder\n */\nexport interface FullMeta {\n  _cdns?: string[]  // Array of CDN base URLs\n  [key: string]: MetaEntry | string[] | undefined\n}\n\n/**\n * Meta schema - keyed by path from public folder\n * Example: { \"/portfolio/photo.jpg\": { o: {w:2400,h:1600}, b: \"...\", sm: {w:300,h:200}, ... } }\n */\nexport type LeanMeta = Record<string, MetaEntry>\n\n// Alias for compatibility\nexport type LeanImageEntry = MetaEntry\n\n/**\n * File/folder item for browser\n */\nexport interface FileItem {\n  name: string\n  path: string\n  type: 'file' | 'folder'\n  size?: number\n  dimensions?: { width: number; height: number }\n  isProcessed?: boolean\n  cdnPushed?: boolean\n  cdnBaseUrl?: string  // CDN base URL when pushed to cloud\n  isRemote?: boolean   // true if CDN URL doesn't match R2 (external import)\n  isProtected?: boolean // true for images folder and its contents (cannot select/modify)\n  // Folder-specific properties\n  fileCount?: number\n  totalSize?: number\n  // For showing thumbnails - path to -sm version if exists\n  thumbnail?: string\n  // Whether a processed thumbnail exists\n  hasThumbnail?: boolean\n}\n\n/**\n * Studio configuration\n */\nexport interface StudioConfig {\n  r2AccountId?: string\n  r2AccessKeyId?: string\n  r2SecretAccessKey?: string\n  r2BucketName?: string\n  r2PublicUrl?: string\n  thumbnailSizes?: {\n    small: number\n    medium: number\n    large: number\n  }\n}\n\n/**\n * Get thumbnail path from original image path\n */\nexport function getThumbnailPath(originalPath: string, size: 'sm' | 'md' | 'lg' | 'full'): string {\n  if (size === 'full') {\n    const ext = originalPath.match(/\\.\\w+$/)?.[0] || '.jpg'\n    const base = originalPath.replace(/\\.\\w+$/, '')\n    const outputExt = ext.toLowerCase() === '.png' ? '.png' : '.jpg'\n    return `/images${base}${outputExt}`\n  }\n  const ext = originalPath.match(/\\.\\w+$/)?.[0] || '.jpg'\n  const base = originalPath.replace(/\\.\\w+$/, '')\n  const outputExt = ext.toLowerCase() === '.png' ? '.png' : '.jpg'\n  return `/images${base}-${size}${outputExt}`\n}\n\n/**\n * Get all thumbnail paths for an image\n */\nexport function getAllThumbnailPaths(originalPath: string): string[] {\n  return [\n    getThumbnailPath(originalPath, 'full'),\n    getThumbnailPath(originalPath, 'lg'),\n    getThumbnailPath(originalPath, 'md'),\n    getThumbnailPath(originalPath, 'sm'),\n  ]\n}\n\n/**\n * Check if an image entry is processed (has any thumbnail dimensions)\n */\nexport function isProcessed(entry: MetaEntry | undefined): boolean {\n  if (!entry) return false\n  return !!(entry.f || entry.lg || entry.md || entry.sm)\n}\n"]}

package/dist/handlers/index.js

@@ -1,7 +1,8 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
 
-var _chunkWJJHVPLTjs = require('../chunk-WJJHVPLT.js');
+
+var _chunkWOHZ4LYGjs = require('../chunk-WOHZ4LYG.js');
 
 // src/handlers/index.ts
 var _server = require('next/server');
@@ -106,16 +107,18 @@ function getContentType(filePath) {
 
 var _sharp = require('sharp'); var _sharp2 = _interopRequireDefault(_sharp);
 var _blurhash = require('blurhash');
+var FULL_MAX_WIDTH = 2560;
 var DEFAULT_SIZES = {
-  small: { width: 300, suffix: "-sm" },
-  medium: { width: 700, suffix: "-md" },
-  large: { width: 1400, suffix: "-lg" }
+  small: { width: 300, suffix: "-sm", key: "sm" },
+  medium: { width: 700, suffix: "-md", key: "md" },
+  large: { width: 1400, suffix: "-lg", key: "lg" }
 };
 async function processImage(buffer, imageKey) {
   const sharpInstance = _sharp2.default.call(void 0, buffer);
   const metadata = await sharpInstance.metadata();
   const originalWidth = metadata.width || 0;
   const originalHeight = metadata.height || 0;
+  const ratio = originalHeight / originalWidth;
   const keyWithoutSlash = imageKey.startsWith("/") ? imageKey.slice(1) : imageKey;
   const baseName = _path2.default.basename(keyWithoutSlash, _path2.default.extname(keyWithoutSlash));
   const ext = _path2.default.extname(keyWithoutSlash).toLowerCase();
@@ -124,19 +127,34 @@ async function processImage(buffer, imageKey) {
   await _fs.promises.mkdir(imagesPath, { recursive: true });
   const isPng = ext === ".png";
   const outputExt = isPng ? ".png" : ".jpg";
+  const entry = {
+    o: { w: originalWidth, h: originalHeight }
+  };
   const fullFileName = imageDir === "." ? `${baseName}${outputExt}` : `${imageDir}/${baseName}${outputExt}`;
   const fullPath = _path2.default.join(process.cwd(), "public", "images", fullFileName);
-  if (isPng) {
-    await _sharp2.default.call(void 0, buffer).png({ quality: 85 }).toFile(fullPath);
+  let fullWidth = originalWidth;
+  let fullHeight = originalHeight;
+  if (originalWidth > FULL_MAX_WIDTH) {
+    fullWidth = FULL_MAX_WIDTH;
+    fullHeight = Math.round(FULL_MAX_WIDTH * ratio);
+    if (isPng) {
+      await _sharp2.default.call(void 0, buffer).resize(fullWidth, fullHeight).png({ quality: 85 }).toFile(fullPath);
+    } else {
+      await _sharp2.default.call(void 0, buffer).resize(fullWidth, fullHeight).jpeg({ quality: 85 }).toFile(fullPath);
+    }
   } else {
-    await _sharp2.default.call(void 0, buffer).jpeg({ quality: 85 }).toFile(fullPath);
+    if (isPng) {
+      await _sharp2.default.call(void 0, buffer).png({ quality: 85 }).toFile(fullPath);
+    } else {
+      await _sharp2.default.call(void 0, buffer).jpeg({ quality: 85 }).toFile(fullPath);
+    }
   }
+  entry.f = { w: fullWidth, h: fullHeight };
   for (const [, sizeConfig] of Object.entries(DEFAULT_SIZES)) {
-    const { width: maxWidth, suffix } = sizeConfig;
+    const { width: maxWidth, suffix, key } = sizeConfig;
     if (originalWidth <= maxWidth) {
       continue;
     }
-    const ratio = originalHeight / originalWidth;
     const newHeight = Math.round(maxWidth * ratio);
     const sizeFileName = `${baseName}${suffix}${outputExt}`;
     const sizeFilePath = imageDir === "." ? sizeFileName : `${imageDir}/${sizeFileName}`;
@@ -146,14 +164,11 @@ async function processImage(buffer, imageKey) {
     } else {
       await _sharp2.default.call(void 0, buffer).resize(maxWidth, newHeight).jpeg({ quality: 80 }).toFile(sizePath);
     }
+    entry[key] = { w: maxWidth, h: newHeight };
   }
   const { data, info } = await _sharp2.default.call(void 0, buffer).resize(32, 32, { fit: "inside" }).ensureAlpha().raw().toBuffer({ resolveWithObject: true });
-  const blurhash = _blurhash.encode.call(void 0, new Uint8ClampedArray(data), info.width, info.height, 4, 4);
-  return {
-    w: originalWidth,
-    h: originalHeight,
-    b: blurhash
-  };
+  entry.b = _blurhash.encode.call(void 0, new Uint8ClampedArray(data), info.width, info.height, 4, 4);
+  return entry;
 }
 
 // src/handlers/utils/cdn.ts
@@ -219,7 +234,7 @@ async function uploadToCdn(imageKey) {
   const bucketName = process.env.CLOUDFLARE_R2_BUCKET_NAME;
   if (!bucketName) throw new Error("R2 bucket not configured");
   const r2 = getR2Client();
-  for (const thumbPath of _chunkWJJHVPLTjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+  for (const thumbPath of _chunkWOHZ4LYGjs.getAllThumbnailPaths.call(void 0, imageKey)) {
     const localPath = _path2.default.join(process.cwd(), "public", thumbPath);
     try {
       const fileBuffer = await _fs.promises.readFile(localPath);
@@ -236,7 +251,7 @@ async function uploadToCdn(imageKey) {
   }
 }
 async function deleteLocalThumbnails(imageKey) {
-  for (const thumbPath of _chunkWJJHVPLTjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+  for (const thumbPath of _chunkWOHZ4LYGjs.getAllThumbnailPaths.call(void 0, imageKey)) {
     const localPath = _path2.default.join(process.cwd(), "public", thumbPath);
     try {
       await _fs.promises.unlink(localPath);
@@ -281,7 +296,7 @@ async function deleteFromCdn(imageKey, hasThumbnails) {
   } catch (e4) {
   }
   if (hasThumbnails) {
-    for (const thumbPath of _chunkWJJHVPLTjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+    for (const thumbPath of _chunkWOHZ4LYGjs.getAllThumbnailPaths.call(void 0, imageKey)) {
       try {
         await r2.send(
           new (0, _clients3.DeleteObjectCommand)({
@@ -400,8 +415,9 @@ async function handleList(request) {
         let thumbnail;
         let hasThumbnail = false;
         let fileSize;
-        if (isImage && entry.p === 1) {
-          const thumbPath = _chunkWJJHVPLTjs.getThumbnailPath.call(void 0, key, "sm");
+        const entryIsProcessed = _chunkWOHZ4LYGjs.isProcessed.call(void 0, entry);
+        if (isImage && entryIsProcessed) {
+          const thumbPath = _chunkWOHZ4LYGjs.getThumbnailPath.call(void 0, key, "sm");
           if (isPushedToCloud && entry.c !== void 0) {
             const cdnUrl = cdnUrls[entry.c];
             if (cdnUrl) {
@@ -443,12 +459,12 @@ async function handleList(request) {
           size: fileSize,
           thumbnail,
           hasThumbnail,
-          isProcessed: entry.p === 1,
+          isProcessed: entryIsProcessed,
           cdnPushed: isPushedToCloud,
           cdnBaseUrl: fileCdnUrl,
           isRemote,
           isProtected: isInsideImagesFolder,
-          dimensions: entry.w && entry.h ? { width: entry.w, height: entry.h } : void 0
+          dimensions: entry.o ? { width: entry.o.w, height: entry.o.h } : void 0
         });
       }
     }
@@ -480,8 +496,9 @@ async function handleSearch(request) {
       const isRemote = isPushedToCloud && (!r2PublicUrl || fileCdnUrl !== r2PublicUrl);
       let thumbnail;
       let hasThumbnail = false;
-      if (isImage && entry.p === 1) {
-        const thumbPath = _chunkWJJHVPLTjs.getThumbnailPath.call(void 0, key, "sm");
+      const entryIsProcessed = _chunkWOHZ4LYGjs.isProcessed.call(void 0, entry);
+      if (isImage && entryIsProcessed) {
+        const thumbPath = _chunkWOHZ4LYGjs.getThumbnailPath.call(void 0, key, "sm");
         if (isPushedToCloud && entry.c !== void 0) {
           const cdnUrl = cdnUrls[entry.c];
           if (cdnUrl) {
@@ -514,11 +531,11 @@ async function handleSearch(request) {
         type: "file",
         thumbnail,
         hasThumbnail,
-        isProcessed: entry.p === 1,
+        isProcessed: entryIsProcessed,
         cdnPushed: isPushedToCloud,
         cdnBaseUrl: fileCdnUrl,
         isRemote,
-        dimensions: entry.w && entry.h ? { width: entry.w, height: entry.h } : void 0
+        dimensions: entry.o ? { width: entry.o.w, height: entry.o.h } : void 0
       });
     }
     return _server.NextResponse.json({ items });
@@ -736,7 +753,7 @@ async function handleDelete(request) {
             for (const key of Object.keys(meta)) {
               if (key.startsWith(prefix) || key === imageKey) {
                 if (!meta[key].c) {
-                  for (const thumbPath of _chunkWJJHVPLTjs.getAllThumbnailPaths.call(void 0, key)) {
+                  for (const thumbPath of _chunkWOHZ4LYGjs.getAllThumbnailPaths.call(void 0, key)) {
                     const absoluteThumbPath = _path2.default.join(process.cwd(), "public", thumbPath);
                     try {
                       await _fs.promises.unlink(absoluteThumbPath);
@@ -752,7 +769,7 @@ async function handleDelete(request) {
             const isInImagesFolder = itemPath.startsWith("public/images/");
             if (!isInImagesFolder && entry) {
               if (!isPushedToCloud) {
-                for (const thumbPath of _chunkWJJHVPLTjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+                for (const thumbPath of _chunkWOHZ4LYGjs.getAllThumbnailPaths.call(void 0, imageKey)) {
                   const absoluteThumbPath = _path2.default.join(process.cwd(), "public", thumbPath);
                   try {
                     await _fs.promises.unlink(absoluteThumbPath);
@@ -864,8 +881,8 @@ async function handleRename(request) {
       const newKey = "/" + newRelativePath;
       if (meta[oldKey]) {
         const entry = meta[oldKey];
-        const oldThumbPaths = _chunkWJJHVPLTjs.getAllThumbnailPaths.call(void 0, oldKey);
-        const newThumbPaths = _chunkWJJHVPLTjs.getAllThumbnailPaths.call(void 0, newKey);
+        const oldThumbPaths = _chunkWOHZ4LYGjs.getAllThumbnailPaths.call(void 0, oldKey);
+        const newThumbPaths = _chunkWOHZ4LYGjs.getAllThumbnailPaths.call(void 0, newKey);
         for (let i = 0; i < oldThumbPaths.length; i++) {
           const oldThumbPath = _path2.default.join(process.cwd(), "public", oldThumbPaths[i]);
           const newThumbPath = _path2.default.join(process.cwd(), "public", newThumbPaths[i]);
@@ -949,7 +966,7 @@ async function handleMoveStream(request) {
           const fileCdnUrl = isInCloud && entry.c !== void 0 ? cdnUrls[entry.c] : void 0;
           const isRemote = isInCloud && (!r2PublicUrl || fileCdnUrl !== r2PublicUrl);
           const isPushedToR2 = isInCloud && r2PublicUrl && fileCdnUrl === r2PublicUrl;
-          const hasProcessedThumbnails = _optionalChain([entry, 'optionalAccess', _19 => _19.p]) === 1;
+          const hasProcessedThumbnails = _chunkWOHZ4LYGjs.isProcessed.call(void 0, entry);
           try {
             if (isRemote && isImage) {
               const remoteUrl = `${fileCdnUrl}${oldKey}`;
@@ -957,9 +974,8 @@ async function handleMoveStream(request) {
               await _fs.promises.mkdir(_path2.default.dirname(newAbsolutePath), { recursive: true });
               await _fs.promises.writeFile(newAbsolutePath, buffer);
               const newEntry = {
-                w: _optionalChain([entry, 'optionalAccess', _20 => _20.w]),
-                h: _optionalChain([entry, 'optionalAccess', _21 => _21.h]),
-                b: _optionalChain([entry, 'optionalAccess', _22 => _22.b])
+                o: _optionalChain([entry, 'optionalAccess', _19 => _19.o]),
+                b: _optionalChain([entry, 'optionalAccess', _20 => _20.b])
               };
               delete meta[oldKey];
               meta[newKey] = newEntry;
@@ -968,17 +984,13 @@ async function handleMoveStream(request) {
               const buffer = await downloadFromCdn(oldKey);
               await _fs.promises.mkdir(_path2.default.dirname(newAbsolutePath), { recursive: true });
               await _fs.promises.writeFile(newAbsolutePath, buffer);
-              const newEntry = {
-                w: _optionalChain([entry, 'optionalAccess', _23 => _23.w]),
-                h: _optionalChain([entry, 'optionalAccess', _24 => _24.h]),
-                b: _optionalChain([entry, 'optionalAccess', _25 => _25.b])
+              let newEntry = {
+                o: _optionalChain([entry, 'optionalAccess', _21 => _21.o]),
+                b: _optionalChain([entry, 'optionalAccess', _22 => _22.b])
               };
               if (hasProcessedThumbnails) {
                 const processedEntry = await processImage(buffer, newKey);
-                newEntry.w = processedEntry.w;
-                newEntry.h = processedEntry.h;
-                newEntry.b = processedEntry.b;
-                newEntry.p = 1;
+                newEntry = { ...newEntry, ...processedEntry };
               }
               await uploadOriginalToCdn(newKey);
               if (hasProcessedThumbnails) {
@@ -992,7 +1004,7 @@ async function handleMoveStream(request) {
               if (hasProcessedThumbnails) {
                 await deleteLocalThumbnails(newKey);
               }
-              newEntry.c = _optionalChain([entry, 'optionalAccess', _26 => _26.c]);
+              newEntry.c = _optionalChain([entry, 'optionalAccess', _23 => _23.c]);
               delete meta[oldKey];
               meta[newKey] = newEntry;
               moved.push(itemPath);
@@ -1017,8 +1029,8 @@ async function handleMoveStream(request) {
               await _fs.promises.rename(absolutePath, newAbsolutePath);
               const stats = await _fs.promises.stat(newAbsolutePath);
               if (stats.isFile() && isImage && entry) {
-                const oldThumbPaths = _chunkWJJHVPLTjs.getAllThumbnailPaths.call(void 0, oldKey);
-                const newThumbPaths = _chunkWJJHVPLTjs.getAllThumbnailPaths.call(void 0, newKey);
+                const oldThumbPaths = _chunkWOHZ4LYGjs.getAllThumbnailPaths.call(void 0, oldKey);
+                const newThumbPaths = _chunkWOHZ4LYGjs.getAllThumbnailPaths.call(void 0, newKey);
                 for (let j = 0; j < oldThumbPaths.length; j++) {
                   const oldThumbPath = _path2.default.join(process.cwd(), "public", oldThumbPaths[j]);
                   const newThumbPath = _path2.default.join(process.cwd(), "public", newThumbPaths[j]);
@@ -1082,7 +1094,7 @@ async function handleSync(request) {
   const accessKeyId = process.env.CLOUDFLARE_R2_ACCESS_KEY_ID;
   const secretAccessKey = process.env.CLOUDFLARE_R2_SECRET_ACCESS_KEY;
   const bucketName = process.env.CLOUDFLARE_R2_BUCKET_NAME;
-  const publicUrl = _optionalChain([process, 'access', _27 => _27.env, 'access', _28 => _28.CLOUDFLARE_R2_PUBLIC_URL, 'optionalAccess', _29 => _29.replace, 'call', _30 => _30(/\/\s*$/, "")]);
+  const publicUrl = _optionalChain([process, 'access', _24 => _24.env, 'access', _25 => _25.CLOUDFLARE_R2_PUBLIC_URL, 'optionalAccess', _26 => _26.replace, 'call', _27 => _27(/\/\s*$/, "")]);
   if (!accountId || !accessKeyId || !secretAccessKey || !bucketName || !publicUrl) {
     return _server.NextResponse.json(
       { error: "R2 not configured. Set CLOUDFLARE_R2_* environment variables." },
@@ -1144,8 +1156,8 @@ async function handleSync(request) {
           })
         );
         urlsToPurge.push(`${publicUrl}${imageKey}`);
-        if (!isRemote && entry.p) {
-          for (const thumbPath of _chunkWJJHVPLTjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+        if (!isRemote && _chunkWOHZ4LYGjs.isProcessed.call(void 0, entry)) {
+          for (const thumbPath of _chunkWOHZ4LYGjs.getAllThumbnailPaths.call(void 0, imageKey)) {
             const localPath = _path2.default.join(process.cwd(), "public", thumbPath);
             try {
               const fileBuffer = await _fs.promises.readFile(localPath);
@@ -1165,7 +1177,7 @@ async function handleSync(request) {
         entry.c = cdnIndex;
         if (!isRemote) {
           const originalLocalPath = _path2.default.join(process.cwd(), "public", imageKey);
-          for (const thumbPath of _chunkWJJHVPLTjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+          for (const thumbPath of _chunkWOHZ4LYGjs.getAllThumbnailPaths.call(void 0, imageKey)) {
             const localPath = _path2.default.join(process.cwd(), "public", thumbPath);
             try {
               await _fs.promises.unlink(localPath);
@@ -1198,7 +1210,7 @@ async function handleSync(request) {
   }
 }
 async function handleReprocess(request) {
-  const publicUrl = _optionalChain([process, 'access', _31 => _31.env, 'access', _32 => _32.CLOUDFLARE_R2_PUBLIC_URL, 'optionalAccess', _33 => _33.replace, 'call', _34 => _34(/\/\s*$/, "")]);
+  const publicUrl = _optionalChain([process, 'access', _28 => _28.env, 'access', _29 => _29.CLOUDFLARE_R2_PUBLIC_URL, 'optionalAccess', _30 => _30.replace, 'call', _31 => _31(/\/\s*$/, "")]);
   try {
     const { imageKeys } = await request.json();
     if (!imageKeys || !Array.isArray(imageKeys) || imageKeys.length === 0) {
@@ -1216,7 +1228,7 @@ async function handleReprocess(request) {
       try {
         let buffer;
         const entry = getMetaEntry(meta, imageKey);
-        const existingCdnIndex = _optionalChain([entry, 'optionalAccess', _35 => _35.c]);
+        const existingCdnIndex = _optionalChain([entry, 'optionalAccess', _32 => _32.c]);
         const existingCdnUrl = existingCdnIndex !== void 0 ? cdnUrls[existingCdnIndex] : void 0;
         const isInOurR2 = existingCdnUrl === publicUrl;
         const isRemote = existingCdnIndex !== void 0 && !isInOurR2;
@@ -1240,11 +1252,10 @@ async function handleReprocess(request) {
           }
         }
         const updatedEntry = await processImage(buffer, imageKey);
-        updatedEntry.p = 1;
         if (isInOurR2) {
           updatedEntry.c = existingCdnIndex;
           await uploadToCdn(imageKey);
-          for (const thumbPath of _chunkWJJHVPLTjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+          for (const thumbPath of _chunkWOHZ4LYGjs.getAllThumbnailPaths.call(void 0, imageKey)) {
             urlsToPurge.push(`${publicUrl}${thumbPath}`);
           }
           await deleteLocalThumbnails(imageKey);
@@ -1276,7 +1287,7 @@ async function handleReprocess(request) {
   }
 }
 async function handleProcessAllStream() {
-  const publicUrl = _optionalChain([process, 'access', _36 => _36.env, 'access', _37 => _37.CLOUDFLARE_R2_PUBLIC_URL, 'optionalAccess', _38 => _38.replace, 'call', _39 => _39(/\/\s*$/, "")]);
+  const publicUrl = _optionalChain([process, 'access', _33 => _33.env, 'access', _34 => _34.CLOUDFLARE_R2_PUBLIC_URL, 'optionalAccess', _35 => _35.replace, 'call', _36 => _36(/\/\s*$/, "")]);
   const encoder = new TextEncoder();
   const stream = new ReadableStream({
     async start(controller) {
@@ -1297,7 +1308,7 @@ async function handleProcessAllStream() {
         for (const [key, entry] of getFileEntries(meta)) {
           const fileName = _path2.default.basename(key);
           if (!isImageFile(fileName)) continue;
-          if (!entry.p) {
+          if (!_chunkWOHZ4LYGjs.isProcessed.call(void 0, entry)) {
             imagesToProcess.push({ key, entry });
           } else {
             alreadyProcessed++;
@@ -1347,10 +1358,10 @@ async function handleProcessAllStream() {
               await _fs.promises.writeFile(destPath, buffer);
               meta[key] = {
                 ...entry,
-                w: 0,
-                h: 0,
+                o: { w: 0, h: 0 },
                 b: "",
-                p: 1
+                f: { w: 0, h: 0 }
+                // SVG has "full" to indicate processed
               };
               if (isRemote) {
                 delete meta[key].c;
@@ -1359,13 +1370,12 @@ async function handleProcessAllStream() {
               const processedEntry = await processImage(buffer, key);
               meta[key] = {
                 ...processedEntry,
-                p: 1,
                 ...isInOurR2 ? { c: existingCdnIndex } : {}
               };
             }
             if (isInOurR2) {
               await uploadToCdn(key);
-              for (const thumbPath of _chunkWJJHVPLTjs.getAllThumbnailPaths.call(void 0, key)) {
+              for (const thumbPath of _chunkWOHZ4LYGjs.getAllThumbnailPaths.call(void 0, key)) {
                 urlsToPurge.push(`${publicUrl}${thumbPath}`);
               }
               await deleteLocalThumbnails(key);
@@ -1384,7 +1394,7 @@ async function handleProcessAllStream() {
         const trackedPaths = /* @__PURE__ */ new Set();
         for (const [imageKey, entry] of getFileEntries(meta)) {
           if (entry.c === void 0) {
-            for (const thumbPath of _chunkWJJHVPLTjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+            for (const thumbPath of _chunkWOHZ4LYGjs.getAllThumbnailPaths.call(void 0, imageKey)) {
               trackedPaths.add(thumbPath);
             }
           }
@@ -1556,7 +1566,7 @@ async function handleScanStream() {
             if (isImage) {
               const ext = _path2.default.extname(relativePath).toLowerCase();
               if (ext === ".svg") {
-                meta[imageKey] = { w: 0, h: 0, b: "" };
+                meta[imageKey] = { o: { w: 0, h: 0 }, b: "" };
               } else {
                 try {
                   const buffer = await _fs.promises.readFile(fullPath);
@@ -1564,12 +1574,11 @@ async function handleScanStream() {
                   const { data, info } = await _sharp2.default.call(void 0, buffer).resize(32, 32, { fit: "inside" }).ensureAlpha().raw().toBuffer({ resolveWithObject: true });
                   const blurhash = _blurhash.encode.call(void 0, new Uint8ClampedArray(data), info.width, info.height, 4, 4);
                   meta[imageKey] = {
-                    w: metadata.width || 0,
-                    h: metadata.height || 0,
+                    o: { w: metadata.width || 0, h: metadata.height || 0 },
                     b: blurhash
                   };
                 } catch (e37) {
-                  meta[imageKey] = { w: 0, h: 0 };
+                  meta[imageKey] = { o: { w: 0, h: 0 } };
                 }
               }
             } else {
@@ -1586,8 +1595,8 @@ async function handleScanStream() {
         const expectedThumbnails = /* @__PURE__ */ new Set();
         const fileEntries = getFileEntries(meta);
         for (const [imageKey, entry] of fileEntries) {
-          if (entry.c === void 0 && entry.p === 1) {
-            for (const thumbPath of _chunkWJJHVPLTjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+          if (entry.c === void 0 && _chunkWOHZ4LYGjs.isProcessed.call(void 0, entry)) {
+            for (const thumbPath of _chunkWOHZ4LYGjs.getAllThumbnailPaths.call(void 0, imageKey)) {
               expectedThumbnails.add(thumbPath);
             }
           }
@@ -1719,8 +1728,7 @@ async function processRemoteImage(url) {
   const { data, info } = await _sharp2.default.call(void 0, buffer).resize(32, 32, { fit: "inside" }).ensureAlpha().raw().toBuffer({ resolveWithObject: true });
   const blurhash = _blurhash.encode.call(void 0, new Uint8ClampedArray(data), info.width, info.height, 4, 4);
   return {
-    w: metadata.width || 0,
-    h: metadata.height || 0,
+    o: { w: metadata.width || 0, h: metadata.height || 0 },
     b: blurhash
   };
 }
@@ -1766,8 +1774,7 @@ async function handleImportUrls(request) {
             const cdnIndex = getOrAddCdnIndex(meta, base);
             const imageData = await processRemoteImage(url);
             setMetaEntry(meta, path9, {
-              w: imageData.w,
-              h: imageData.h,
+              o: imageData.o,
               b: imageData.b,
               c: cdnIndex
             });