pixelkiln 0.27.0 → 0.28.0

package/dist/index.cjs

@@ -9903,6 +9903,7 @@ function createGalleryEditHandler(opts) {
 }
 
 // src/gallery/snapshot.ts
+var PROJECT_FILE_TYPE = "application/octet-stream";
 function galleryMediaId(absolutePath) {
   return (0, import_node_crypto6.createHash)("sha256").update(import_node_path25.default.resolve(absolutePath)).digest("hex").slice(0, 24);
 }
@@ -10052,12 +10053,20 @@ async function buildGallerySnapshot(opts) {
         const companion = await readHandEditCompanion(editPath);
         if (companion) {
           const projectPath = handEditProjectPath(editPath);
+          const project = companion.project && (0, import_node_fs21.existsSync)(projectPath) ? await fileInfo(projectPath) : null;
+          let projectUrl = null;
+          if (project) {
+            const id = galleryMediaId(projectPath);
+            media.set(id, { path: projectPath, contentType: PROJECT_FILE_TYPE });
+            projectUrl = `${galleryMediaRoute(id)}?v=${project.bytes}-${Date.parse(project.modifiedAt).toString(36)}`;
+          }
           editMeta = {
             editor: companion.editor,
             savedAt: companion.savedAt,
             basedOn: companion.basedOn,
             changedSince: editSha !== null && editSha !== companion.sha256,
-            project: companion.project && (0, import_node_fs21.existsSync)(projectPath) ? portableOutputPath(projectPath, root) : null
+            project: project ? portableOutputPath(projectPath, root) : null,
+            projectUrl
           };
         }
         const regenerated = companion ? generated?.sha256 !== void 0 && generated.sha256 !== null && companion.basedOn !== generated.sha256 : Boolean(generated?.modifiedAt && edit.modifiedAt && generated.modifiedAt > edit.modifiedAt && generated.exists);
@@ -11148,30 +11157,42 @@ function openEditorSheet(item) {
   stage.append(frame, loading);
   panel.append(bar, stage);
   host.append(scrim, panel);
-  SHEET = { item, frame, loading, status, msg, save, saveClose, dirty: false, opened: false, ready: null, pending: null, requests: 0, source: src };
+  SHEET = { item, frame, loading, status, msg, save, saveClose, dirty: false, opened: false, ready: null, pending: null, requests: 0, source: src, sentProject: false };
   sheetStatus('cool', 'loading');
   sheetButtons();
   close.focus({ preventScroll: true });
 }
+// The edit file is what the editor gets; when a browser save kept the layered
+// project beside it, that goes along too and the editor restores the layers,
+// falling back to the flattened PNG if the file cannot be read.
 async function sendOpen() {
   const { item, source } = SHEET;
   const style = snap.styles.find((s) => s.id === item.styleId && s.project === item.project);
-  let png;
+  const projectUrl = source === item.edit && item.editMeta && item.editMeta.projectUrl && SHEET.ready.version >= 2 ? item.editMeta.projectUrl : null;
+  let png, pxo = null;
   try {
     const res = await fetch(source.url, { cache: 'no-store' });
     if (!res.ok) throw new Error(await res.text());
     png = await res.arrayBuffer();
+    if (projectUrl) {
+      const p = await fetch(projectUrl, { cache: 'no-store' });
+      if (p.ok) pxo = await p.arrayBuffer();
+    }
   } catch (err) {
     if (SHEET) { SHEET.msg.textContent = 'Could not load the image: ' + err.message; sheetStatus('bad', 'failed'); }
     return;
   }
   if (!SHEET) return;
   const request = 'open-' + (++SHEET.requests);
-  SHEET.frame.contentWindow.postMessage({
+  SHEET.sentProject = !!pxo;
+  const message = {
     type: 'pixelkiln:open', request,
     asset: { key: item.styleId + '/' + item.assetId, id: item.id, name: item.assetId, width: item.width, height: item.height },
     png, palette: style ? style.palette : [],
-  }, location.origin, [png]);
+  };
+  const transfer = [png];
+  if (pxo) { message.pxo = pxo; transfer.push(pxo); }
+  SHEET.frame.contentWindow.postMessage(message, location.origin, transfer);
   sheetStatus('cool', 'opening');
 }
 function requestEditorSave(close) {
@@ -11197,7 +11218,9 @@ async function onEditorMessage(m) {
     case 'pixelkiln:opened':
       SHEET.opened = true;
       SHEET.loading.remove();
-      sheetStatus('ok', SHEET.item.edit && SHEET.item.edit.exists ? 'editing the edit file' : 'editing a copy of the generated art');
+      if (m.source === 'pxo') sheetStatus('ok', 'editing the edit file with its ' + (m.layers === 1 ? 'layer' : m.layers + ' layers') + ' restored');
+      else if (SHEET.sentProject) sheetStatus('warn', 'editing the flattened edit file; its layer file could not be opened');
+      else sheetStatus('ok', SHEET.item.edit && SHEET.item.edit.exists ? 'editing the edit file' : 'editing a copy of the generated art');
       sheetButtons();
       break;
     case 'pixelkiln:dirty':