flavor-code 1.3.21 → 1.3.23

package/dist/{app-Q4M7GLFX.js → app-NTEUPJKJ.js}

@@ -1523,43 +1523,160 @@ function isBridgeMethod(value, method) {
     && typeof value[method] === "function";
 }
 
-try {
-  const pasteboard = $.NSPasteboard.generalPasteboard;
-  let data = null;
-  if (isBridgeMethod(pasteboard, "dataForType")) {
-    const png = pasteboard.dataForType($.NSPasteboardTypePNG);
-    if (isBridgeMethod(png, "base64EncodedStringWithOptions")) {
-      data = png;
-    } else {
-      const tiff = pasteboard.dataForType($.NSPasteboardTypeTIFF);
-      // NSData.length is exposed by JXA as a property value, not a
-      // callable bridge method. Probe a real NSData method so a valid
-      // TIFF-only pasteboard item is not mistaken for ObjC nil.
-      if (isBridgeMethod(tiff, "base64EncodedStringWithOptions")) {
-        const representation = $.NSBitmapImageRep.imageRepWithData(tiff);
-        if (isBridgeMethod(representation, "representationUsingTypeProperties")) {
-          const converted = representation.representationUsingTypeProperties(
-            $.NSBitmapImageFileTypePNG,
-            $({})
-          );
-          if (isBridgeMethod(converted, "base64EncodedStringWithOptions")) {
-            data = converted;
-          }
-        }
-      }
+function safeDataForType(pasteboard, type) {
+  try {
+    return isBridgeMethod(pasteboard, "dataForType")
+      ? pasteboard.dataForType(type)
+      : null;
+  } catch (error) {
+    return null;
+  }
+}
+
+function pngDataFromTiff(tiff) {
+  if (!isBridgeMethod(tiff, "base64EncodedStringWithOptions")) {
+    return null;
+  }
+  try {
+    const representation = $.NSBitmapImageRep.imageRepWithData(tiff);
+    if (!isBridgeMethod(representation, "representationUsingTypeProperties")) {
+      return null;
+    }
+    const converted = representation.representationUsingTypeProperties(
+      $.NSBitmapImageFileTypePNG,
+      $({})
+    );
+    return isBridgeMethod(converted, "base64EncodedStringWithOptions")
+      ? converted
+      : null;
+  } catch (error) {
+    return null;
+  }
+}
+
+function base64FromData(data) {
+  if (!isBridgeMethod(data, "base64EncodedStringWithOptions")) {
+    return null;
+  }
+  try {
+    const encoded = data.base64EncodedStringWithOptions(0);
+    if (!encoded) {
+      return null;
+    }
+    const unwrapped = ObjC.unwrap(encoded);
+    return typeof unwrapped === "string" && unwrapped.length > 0
+      ? unwrapped
+      : null;
+  } catch (error) {
+    return null;
+  }
+}
+
+function firstReadableObject(pasteboard, objectClass) {
+  try {
+    if (!isBridgeMethod(pasteboard, "readObjectsForClassesOptions")) {
+      return null;
+    }
+    const classes = $.NSArray.arrayWithObject(objectClass);
+    const objects = pasteboard.readObjectsForClassesOptions(classes, $({}));
+    return objects === null || objects === undefined ? null : objects.firstObject;
+  } catch (error) {
+    return null;
+  }
+}
+
+function imageFromWholePasteboard(pasteboard) {
+  try {
+    const image = $.NSImage.alloc.initWithPasteboard(pasteboard);
+    return image === null || image === undefined ? null : image;
+  } catch (error) {
+    return null;
+  }
+}
+
+function imageFromFileUrl(pasteboard) {
+  try {
+    const url = firstReadableObject(pasteboard, $.NSURL);
+    if (url === null || url === undefined || !url.isFileURL) {
+      return null;
     }
+    const image = $.NSImage.alloc.initWithContentsOfURL(url);
+    return image === null || image === undefined ? null : image;
+  } catch (error) {
+    return null;
   }
-  if (!data) {
-    $.exit(3);
+}
+
+function base64FromImage(image) {
+  try {
+    return image === null || image === undefined
+      ? null
+      : base64FromData(pngDataFromTiff(image.TIFFRepresentation));
+  } catch (error) {
+    return null;
   }
-  const encoded = data.base64EncodedStringWithOptions(0);
-  if (!encoded) {
-    $.exit(3);
+}
+
+function pasteboardTypeNames(pasteboard) {
+  try {
+    const types = pasteboard.types;
+    if (!isBridgeMethod(types, "objectAtIndex")) {
+      return [];
+    }
+    const count = Number(types.count);
+    const names = [];
+    for (let index = 0; index < count; index += 1) {
+      const name = ObjC.unwrap(types.objectAtIndex(index));
+      if (typeof name === "string") {
+        names.push(name);
+      }
+    }
+    return names;
+  } catch (error) {
+    return [];
+  }
+}
+
+const pasteboard = $.NSPasteboard.generalPasteboard;
+let encoded = base64FromData(safeDataForType(pasteboard, $("public.png")));
+
+if (!encoded) {
+  encoded = base64FromData(
+    pngDataFromTiff(safeDataForType(pasteboard, $("public.tiff")))
+  );
+}
+
+// Ask AppKit for objects conforming to NSPasteboardReading. This covers image
+// formats and lazy providers that do not expose direct PNG/TIFF NSData.
+if (!encoded) {
+  encoded = base64FromImage(firstReadableObject(pasteboard, $.NSImage));
+}
+
+if (!encoded) {
+  encoded = base64FromImage(imageFromWholePasteboard(pasteboard));
+}
+
+// Finder copies files as file URLs instead of image bytes. Load the first
+// local file through NSImage, which also rejects non-image files.
+if (!encoded) {
+  encoded = base64FromImage(imageFromFileUrl(pasteboard));
+}
+
+if (!encoded) {
+  const types = pasteboardTypeNames(pasteboard);
+  const advertisedImage = types.some(function (type) {
+    return /image|png|tiff|jpeg|jpg|heic|gif|webp|bmp|pdf|file-url|filenames/i.test(type);
+  });
+  if (advertisedImage) {
+    throw new Error(
+      "Clipboard advertises image or file data but AppKit could not decode it. Types: "
+        + types.join(", ")
+    );
   }
-  console.log(ObjC.unwrap(encoded));
-} catch (error) {
   $.exit(3);
 }
+
+console.log(encoded);
 `.trim();
 function shouldReadClipboardImage(input, key, isPasted) {
   return (key.ctrl || key.meta === true) && input.toLowerCase() === "v" || isPasted && input.length === 0;

package/dist/cli-main.js

@@ -882,7 +882,7 @@ async function runInteractiveCli(props) {
   const [{ render, AlternateScreen }, { createElement }, { App }] = await Promise.all([
     import("./claude-ink-6CEG2XZZ.js"),
     import("react"),
-    import("./app-Q4M7GLFX.js")
+    import("./app-NTEUPJKJ.js")
   ]);
   const instance = await render(createElement(
     AlternateScreen,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flavor-code",
-  "version": "1.3.21",
+  "version": "1.3.23",
   "author": "YachuanWzh",
   "type": "module",
   "publishConfig": {