@gallop.software/studio 0.1.91 → 0.1.92

package/dist/{chunk-RURSHIQJ.js → chunk-L36EH3PM.js}

@@ -24,4 +24,4 @@ function getAllThumbnailPaths(originalPath) {
 
 
 exports.getThumbnailPath = getThumbnailPath; exports.getAllThumbnailPaths = getAllThumbnailPaths;
-//# sourceMappingURL=chunk-RURSHIQJ.js.map
+//# sourceMappingURL=chunk-L36EH3PM.js.map

package/dist/chunk-L36EH3PM.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["/Users/chrisb/Sites/studio/dist/chunk-L36EH3PM.js","../src/types.ts"],"names":["ext","base","outputExt"],"mappings":"AAAA;AC6DO,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;AD/D2B;AACA;AACA;AACA;AACA","file":"/Users/chrisb/Sites/studio/dist/chunk-L36EH3PM.js","sourcesContent":[null,"/**\n * Meta entry - works for images and non-images\n * Images have w, h, b (after processing)\n * Non-images just have c (if pushed to CDN)\n */\nexport interface MetaEntry {\n  w?: number     // original width (images only)\n  h?: number     // original height (images only)\n  b?: string     // blurhash (images only, after processing)\n  p?: 1          // processed (has thumbnails and blurhash)\n  c?: 1          // pushed to CDN (omit if not pushed)\n}\n\n/**\n * Meta schema - keyed by path from public folder\n * Example: { \"/portfolio/photo.jpg\": { w: 2400, h: 1600, blur: \"...\" } }\n */\nexport type LeanMeta = Record<string, MetaEntry>\n\n// Legacy 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  // 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"]}

package/dist/handlers/index.d.mts

@@ -1,4 +1,4 @@
-import { F as FileItem } from '../types-DuX-sfUL.mjs';
+import { F as FileItem } from '../types-C4hCz2w8.mjs';
 import { NextRequest, NextResponse } from 'next/server';
 
 /**

package/dist/handlers/index.d.ts

@@ -1,4 +1,4 @@
-import { F as FileItem } from '../types-DuX-sfUL.js';
+import { F as FileItem } from '../types-C4hCz2w8.js';
 import { NextRequest, NextResponse } from 'next/server';
 
 /**

package/dist/handlers/index.js

@@ -1,7 +1,7 @@
 "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 _chunkRURSHIQJjs = require('../chunk-RURSHIQJ.js');
+var _chunkL36EH3PMjs = require('../chunk-L36EH3PM.js');
 
 // src/handlers/index.ts
 var _server = require('next/server');
@@ -156,7 +156,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 _chunkRURSHIQJjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+  for (const thumbPath of _chunkL36EH3PMjs.getAllThumbnailPaths.call(void 0, imageKey)) {
     const localPath = _path2.default.join(process.cwd(), "public", thumbPath);
     try {
       const fileBuffer = await _fs.promises.readFile(localPath);
@@ -173,7 +173,7 @@ async function uploadToCdn(imageKey) {
   }
 }
 async function deleteLocalThumbnails(imageKey) {
-  for (const thumbPath of _chunkRURSHIQJjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+  for (const thumbPath of _chunkL36EH3PMjs.getAllThumbnailPaths.call(void 0, imageKey)) {
     const localPath = _path2.default.join(process.cwd(), "public", thumbPath);
     try {
       await _fs.promises.unlink(localPath);
@@ -227,7 +227,7 @@ async function handleList(request) {
         let hasThumbnail = false;
         let fileSize;
         if (isImage && (entry.w || entry.b)) {
-          const thumbPath = _chunkRURSHIQJjs.getThumbnailPath.call(void 0, key, "sm");
+          const thumbPath = _chunkL36EH3PMjs.getThumbnailPath.call(void 0, key, "sm");
           if (isPushedToCloud) {
             const cdnUrl = process.env.CLOUDFLARE_R2_PUBLIC_URL || process.env.NEXT_PUBLIC_CLOUDFLARE_R2_PUBLIC_URL;
             if (cdnUrl) {
@@ -264,6 +264,7 @@ async function handleList(request) {
           size: fileSize,
           thumbnail,
           hasThumbnail,
+          isProcessed: entry.p === 1,
           cdnPushed: isPushedToCloud,
           dimensions: entry.w && entry.h ? { width: entry.w, height: entry.h } : void 0
         });
@@ -293,7 +294,7 @@ async function handleSearch(request) {
       let thumbnail;
       let hasThumbnail = false;
       if (isImage && (entry.w || entry.b)) {
-        const thumbPath = _chunkRURSHIQJjs.getThumbnailPath.call(void 0, key, "sm");
+        const thumbPath = _chunkL36EH3PMjs.getThumbnailPath.call(void 0, key, "sm");
         if (isPushedToCloud) {
           const cdnUrl = process.env.CLOUDFLARE_R2_PUBLIC_URL || process.env.NEXT_PUBLIC_CLOUDFLARE_R2_PUBLIC_URL;
           if (cdnUrl) {
@@ -321,6 +322,7 @@ async function handleSearch(request) {
         type: "file",
         thumbnail,
         hasThumbnail,
+        isProcessed: entry.p === 1,
         cdnPushed: isPushedToCloud,
         dimensions: entry.w && entry.h ? { width: entry.w, height: entry.h } : void 0
       });
@@ -522,7 +524,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 _chunkRURSHIQJjs.getAllThumbnailPaths.call(void 0, key)) {
+                  for (const thumbPath of _chunkL36EH3PMjs.getAllThumbnailPaths.call(void 0, key)) {
                     const absoluteThumbPath = _path2.default.join(process.cwd(), "public", thumbPath);
                     try {
                       await _fs.promises.unlink(absoluteThumbPath);
@@ -538,7 +540,7 @@ async function handleDelete(request) {
             const isInImagesFolder = itemPath.startsWith("public/images/");
             if (!isInImagesFolder && entry) {
               if (!isPushedToCloud) {
-                for (const thumbPath of _chunkRURSHIQJjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+                for (const thumbPath of _chunkL36EH3PMjs.getAllThumbnailPaths.call(void 0, imageKey)) {
                   const absoluteThumbPath = _path2.default.join(process.cwd(), "public", thumbPath);
                   try {
                     await _fs.promises.unlink(absoluteThumbPath);
@@ -650,8 +652,8 @@ async function handleRename(request) {
       const newKey = "/" + newRelativePath;
       if (meta[oldKey]) {
         const entry = meta[oldKey];
-        const oldThumbPaths = _chunkRURSHIQJjs.getAllThumbnailPaths.call(void 0, oldKey);
-        const newThumbPaths = _chunkRURSHIQJjs.getAllThumbnailPaths.call(void 0, newKey);
+        const oldThumbPaths = _chunkL36EH3PMjs.getAllThumbnailPaths.call(void 0, oldKey);
+        const newThumbPaths = _chunkL36EH3PMjs.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]);
@@ -730,8 +732,8 @@ async function handleMove(request) {
           const newKey = "/" + newRelativePath;
           if (meta[oldKey]) {
             const entry = meta[oldKey];
-            const oldThumbPaths = _chunkRURSHIQJjs.getAllThumbnailPaths.call(void 0, oldKey);
-            const newThumbPaths = _chunkRURSHIQJjs.getAllThumbnailPaths.call(void 0, newKey);
+            const oldThumbPaths = _chunkL36EH3PMjs.getAllThumbnailPaths.call(void 0, oldKey);
+            const newThumbPaths = _chunkL36EH3PMjs.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]);
@@ -805,6 +807,10 @@ async function handleSync(request) {
         pushed.push(imageKey);
         continue;
       }
+      if (!entry.p) {
+        errors.push(`Image not processed: ${imageKey}. Run Process Images first.`);
+        continue;
+      }
       try {
         const originalLocalPath = _path2.default.join(process.cwd(), "public", imageKey);
         try {
@@ -821,7 +827,7 @@ async function handleSync(request) {
           errors.push(`Original file not found: ${imageKey}`);
           continue;
         }
-        for (const thumbPath of _chunkRURSHIQJjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+        for (const thumbPath of _chunkL36EH3PMjs.getAllThumbnailPaths.call(void 0, imageKey)) {
           const localPath = _path2.default.join(process.cwd(), "public", thumbPath);
           try {
             const fileBuffer = await _fs.promises.readFile(localPath);
@@ -837,7 +843,7 @@ async function handleSync(request) {
           }
         }
         entry.c = 1;
-        for (const thumbPath of _chunkRURSHIQJjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+        for (const thumbPath of _chunkL36EH3PMjs.getAllThumbnailPaths.call(void 0, imageKey)) {
           const localPath = _path2.default.join(process.cwd(), "public", thumbPath);
           try {
             await _fs.promises.unlink(localPath);
@@ -935,16 +941,11 @@ async function handleProcessAllStream() {
         const errors = [];
         const orphansRemoved = [];
         let alreadyProcessed = 0;
-        let pushedToCloud = 0;
         const imagesToProcess = [];
         for (const [key, entry] of Object.entries(meta)) {
           const fileName = _path2.default.basename(key);
           if (!isImageFile(fileName)) continue;
-          if (entry.c) {
-            pushedToCloud++;
-            continue;
-          }
-          if (!entry.b) {
+          if (!entry.p) {
             imagesToProcess.push({ key, entry });
           } else {
             alreadyProcessed++;
@@ -953,8 +954,9 @@ async function handleProcessAllStream() {
         const total = imagesToProcess.length;
         sendEvent({ type: "start", total });
         for (let i = 0; i < imagesToProcess.length; i++) {
-          const { key } = imagesToProcess[i];
+          const { key, entry } = imagesToProcess[i];
           const fullPath = _path2.default.join(process.cwd(), "public", key);
+          const isInCloud = entry.c === 1;
           sendEvent({
             type: "progress",
             current: i + 1,
@@ -964,7 +966,15 @@ async function handleProcessAllStream() {
             // Remove leading /
           });
           try {
-            const buffer = await _fs.promises.readFile(fullPath);
+            let buffer;
+            if (isInCloud) {
+              buffer = await downloadFromCdn(key);
+              const dir = _path2.default.dirname(fullPath);
+              await _fs.promises.mkdir(dir, { recursive: true });
+              await _fs.promises.writeFile(fullPath, buffer);
+            } else {
+              buffer = await _fs.promises.readFile(fullPath);
+            }
             const ext = _path2.default.extname(key).toLowerCase();
             const isSvg = ext === ".svg";
             if (isSvg) {
@@ -975,13 +985,27 @@ async function handleProcessAllStream() {
               const destPath = _path2.default.join(imagesPath, fileName);
               await _fs.promises.writeFile(destPath, buffer);
               meta[key] = {
+                ...entry,
                 w: 0,
                 h: 0,
-                b: ""
+                b: "",
+                p: 1
               };
             } else {
               const processedEntry = await processImage(buffer, key);
-              meta[key] = processedEntry;
+              meta[key] = {
+                ...processedEntry,
+                p: 1,
+                ...isInCloud ? { c: 1 } : {}
+              };
+            }
+            if (isInCloud) {
+              await uploadToCdn(key);
+              await deleteLocalThumbnails(key);
+              try {
+                await _fs.promises.unlink(fullPath);
+              } catch (e25) {
+              }
             }
             processed.push(key.slice(1));
           } catch (error) {
@@ -993,7 +1017,7 @@ async function handleProcessAllStream() {
         const trackedPaths = /* @__PURE__ */ new Set();
         for (const imageKey of Object.keys(meta)) {
           if (!meta[imageKey].c) {
-            for (const thumbPath of _chunkRURSHIQJjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+            for (const thumbPath of _chunkL36EH3PMjs.getAllThumbnailPaths.call(void 0, imageKey)) {
               trackedPaths.add(thumbPath);
             }
           }
@@ -1019,13 +1043,13 @@ async function handleProcessAllStream() {
                 }
               }
             }
-          } catch (e25) {
+          } catch (e26) {
           }
         }
         const imagesDir = _path2.default.join(process.cwd(), "public", "images");
         try {
           await findOrphans(imagesDir);
-        } catch (e26) {
+        } catch (e27) {
         }
         async function removeEmptyDirs(dir) {
           try {
@@ -1043,20 +1067,19 @@ async function handleProcessAllStream() {
               await _fs.promises.rmdir(dir);
             }
             return isEmpty;
-          } catch (e27) {
+          } catch (e28) {
             return true;
           }
         }
         try {
           await removeEmptyDirs(imagesDir);
-        } catch (e28) {
+        } catch (e29) {
         }
         await saveMeta(meta);
         sendEvent({
           type: "complete",
           processed: processed.length,
           alreadyProcessed,
-          pushedToCloud,
           orphansRemoved: orphansRemoved.length,
           errors: errors.length
         });
@@ -1111,7 +1134,7 @@ async function handleScanStream() {
                 allFiles.push({ relativePath: relPath, fullPath });
               }
             }
-          } catch (e29) {
+          } catch (e30) {
           }
         }
         const publicDir = _path2.default.join(process.cwd(), "public");
@@ -1167,7 +1190,7 @@ async function handleScanStream() {
                     w: metadata.width || 0,
                     h: metadata.height || 0
                   };
-                } catch (e30) {
+                } catch (e31) {
                   meta[imageKey] = { w: 0, h: 0 };
                 }
               }