photosuite 0.1.1 → 0.1.2

package/dist/integration.d.ts

@@ -13,6 +13,10 @@ export default function astroPhotosuite(options: PhotosuiteOptions): {
         "astro:config:setup": ({ injectScript, updateConfig }: any) => void;
     };
 };
+/**
+ * 允许使用 import { photosuite } from 'photosuite' 语法
+ */
+export declare const photosuite: typeof astroPhotosuite;
 export { imageUrl } from './remark/imageUrl';
 export { exiftoolVendored } from './rehype/exiftoolVendored';
 export type { PhotosuiteOptions, ImageUrlOptions } from './types';

package/dist/photosuite.integration.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports,`__esModule`,{value:!0});var e=Object.create,t=Object.defineProperty,n=Object.getOwnPropertyDescriptor,r=Object.getOwnPropertyNames,i=Object.getPrototypeOf,a=Object.prototype.hasOwnProperty,o=(e,i,o,s)=>{if(i&&typeof i==`object`||typeof i==`function`)for(var c=r(i),l=0,u=c.length,d;l<u;l++)d=c[l],!a.call(e,d)&&d!==o&&t(e,d,{get:(e=>i[e]).bind(null,d),enumerable:!(s=n(i,d))||s.enumerable});return e},s=(n,r,a)=>(a=n==null?{}:e(i(n)),o(r||!n||!n.__esModule?t(a,`default`,{value:n,enumerable:!0}):a,n));let c=require(`exiftool-vendored`),l=require(`node:fs`);l=s(l);let u=require(`node:fs/promises`);u=s(u);let d=require(`node:path`);d=s(d);let f=require(`node:http`);f=s(f);let p=require(`node:https`);p=s(p);let m=require(`node:os`);m=s(m);let h=require(`node:url`);var g=(...e)=>{let t=e.filter(e=>typeof e==`string`&&e!==``);if(t.length===0)return``;if(t.length===1)return t[0];let n=t[0],r=t[1],i=`${n.endsWith(`/`)?n.slice(0,-1):n}/${r.startsWith(`/`)?r.slice(1):r}`;return t.length>2?g(i,...t.slice(2)):i},_=e=>!(!e||/^https?:\/\//i.test(e)||e.startsWith(`/`)||e.startsWith(`./`)||e.startsWith(`../`));function v(e={}){let{imageBase:t,imageDir:n=`imageDir`,fileDir:r=!1}=e;return(e,i)=>{let a=(i?.data?.astro?.frontmatter||i?.data?.frontmatter||{})[n]||``,o=(i?.path||i?.history?.[0]||``).split(/[\\/]/).pop()?.split(`.`).shift()||``,s=r?o:a,c=e=>{if(e){if(e.type===`image`){let n=e.url||``;(t||s)&&_(n)&&(e.url=g(t,s,n))}e.children&&e.children.length&&e.children.forEach(c)}};c(e)}}function y(e){try{let t=new h.URL(e);return t.protocol===`http:`||t.protocol===`https:`}catch{return!1}}async function b(e){let t=m.tmpdir(),n=d.extname(e)||`.bin`,r=d.join(t,`exif-${Date.now()}-${Math.random().toString(36).slice(2)}${n}`),i=l.createWriteStream(r),a=e.startsWith(`https:`)?p:f;return await new Promise((t,n)=>{a.get(e,e=>{if(e.statusCode&&e.statusCode>=300&&e.statusCode<400&&e.headers.location,e.statusCode!==200){n(Error(`HTTP `+e.statusCode));return}e.pipe(i),i.on(`finish`,t),i.on(`error`,n)}).on(`error`,n)}),{path:r,cleanup:async()=>{try{await u.unlink(r)}catch{}}}}async function x(e){let t=await c.exiftool.read(e);return{SourceFile:t.SourceFile,ExifToolVersion:t.ExifToolVersion,MIMEType:t.MIMEType,FileType:t.FileType,Make:t.Make,Model:t.Model,LensModel:t.LensModel,DateTimeOriginal:t.DateTimeOriginal,CreateDate:t.CreateDate,ModifyDate:t.ModifyDate,ImageWidth:t.ImageWidth,ImageHeight:t.ImageHeight,GPSLatitude:t.GPSLatitude,GPSLongitude:t.GPSLongitude,FNumber:t.FNumber,ExposureTime:t.ExposureTime,ISO:t.ISO,FocalLength:t.FocalLength,warnings:t.warnings||[],errors:t.errors||[]}}function S(e,t){if(t==null)return``;switch(e){case`FNumber`:return`ƒ/${Number(t).toFixed(1)}`;case`ExposureTime`:return typeof t==`number`?t>=1?`${t}s`:`1/${Math.round(1/t)}s`:t.toString();case`ISO`:return`ISO ${t}`;case`FocalLength`:let e=t.toString();return e.endsWith(`mm`)?e:`${e}mm`;case`DateTimeOriginal`:return typeof t==`object`&&t.year?`${t.year}/${t.month}/${t.day}`:t.toString();default:return t.toString()}}async function C(e,t,n){let r=e.properties?.src;if(!r)return;let i=``,a;try{if(y(r)){let e=await b(r);i=e.path,a=e.cleanup}else if(d.isAbsolute(r))i=r;else{let e=d.dirname(t.path);i=d.resolve(e,r)}if(i&&(l.existsSync(i)||y(r))&&(l.existsSync(i)||(i=decodeURIComponent(i)),l.existsSync(i))){let t=await x(i);if(!(t.FNumber&&t.ExposureTime&&t.ISO))return;let r=typeof n.exif==`object`?n.exif:{},a=r.fields||[`Model`,`LensModel`,`FocalLength`,`FNumber`,`ExposureTime`,`ISO`,`DateTimeOriginal`],o=r.separator||` · `,s=a.map(e=>{let n=t[e];return n?S(e,n):null}).filter(Boolean);if(s.length===0)return;let c=s.join(o),l={...e.properties};e.tagName=`div`,e.properties={className:[`photosuite-item`]},e.children=[{type:`element`,tagName:`img`,properties:l,children:[]},{type:`element`,tagName:`div`,properties:{className:[`photosuite-exif`]},children:[{type:`text`,value:c}]}]}}catch(e){console.warn(`[photosuite] Failed to get EXIF for ${r}:`,e)}finally{a&&await a()}}function w(e={}){return async(t,n)=>{let r=[],i=t=>{t.type===`element`&&t.tagName===`img`&&r.push(C(t,n,e)),t.children&&t.children.forEach(i)};i(t),r.length>0&&await Promise.all(r)}}function T(e){return{name:`photosuite`,hooks:{"astro:config:setup":({injectScript:t,updateConfig:n})=>{t(`page`,`
-                    import { photosuite } from 'photosuite';
+                    import { photosuite } from 'photosuite/client';
                     const __opts = ${JSON.stringify(e)};
                     const __run = () => photosuite(__opts);
                     __run();
                     document.addEventListener('astro:page-load', __run);
-                    `);let r=[],i=[];i.push([v,e]),e.exif!==!1&&r.push([w,e]);let a={markdown:{}};r.length>0&&(a.markdown.rehypePlugins=r),i.length>0&&(a.markdown.remarkPlugins=i),Object.keys(a.markdown).length>0&&n(a)}}}}exports.default=T,exports.exiftoolVendored=w,exports.imageUrl=v;
+                    `);let r=[],i=[];i.push([v,e]),e.exif!==!1&&r.push([w,e]);let a={markdown:{}};r.length>0&&(a.markdown.rehypePlugins=r),i.length>0&&(a.markdown.remarkPlugins=i),Object.keys(a.markdown).length>0&&n(a)}}}}const E=T;exports.default=T,exports.exiftoolVendored=w,exports.imageUrl=v,exports.photosuite=E;

package/dist/photosuite.integration.js

@@ -7,109 +7,109 @@ import * as https from "node:https";
 import * as os from "node:os";
 import { URL } from "node:url";
 var join = (...e) => {
-	let s = e.filter((e) => typeof e == "string" && e !== "");
-	if (s.length === 0) return "";
-	if (s.length === 1) return s[0];
-	let c = s[0], l = s[1], u = `${c.endsWith("/") ? c.slice(0, -1) : c}/${l.startsWith("/") ? l.slice(1) : l}`;
-	return s.length > 2 ? join(u, ...s.slice(2)) : u;
+	let c = e.filter((e) => typeof e == "string" && e !== "");
+	if (c.length === 0) return "";
+	if (c.length === 1) return c[0];
+	let l = c[0], u = c[1], d = `${l.endsWith("/") ? l.slice(0, -1) : l}/${u.startsWith("/") ? u.slice(1) : u}`;
+	return c.length > 2 ? join(d, ...c.slice(2)) : d;
 }, isShort = (e) => !(!e || /^https?:\/\//i.test(e) || e.startsWith("/") || e.startsWith("./") || e.startsWith("../"));
 function imageUrl(e = {}) {
-	let { imageBase: s, imageDir: c = "imageDir", fileDir: l = !1 } = e;
-	return (e, u) => {
-		let d = (u?.data?.astro?.frontmatter || u?.data?.frontmatter || {})[c] || "", f = (u?.path || u?.history?.[0] || "").split(/[\\/]/).pop()?.split(".").shift() || "", p = l ? f : d, g = (e) => {
+	let { imageBase: c, imageDir: l = "imageDir", fileDir: u = !1 } = e;
+	return (e, d) => {
+		let f = (d?.data?.astro?.frontmatter || d?.data?.frontmatter || {})[l] || "", p = (d?.path || d?.history?.[0] || "").split(/[\\/]/).pop()?.split(".").shift() || "", m = u ? p : f, _ = (e) => {
 			if (e) {
 				if (e.type === "image") {
-					let c = e.url || "";
-					(s || p) && isShort(c) && (e.url = join(s, p, c));
+					let l = e.url || "";
+					(c || m) && isShort(l) && (e.url = join(c, m, l));
 				}
-				e.children && e.children.length && e.children.forEach(g);
+				e.children && e.children.length && e.children.forEach(_);
 			}
 		};
-		g(e);
+		_(e);
 	};
 }
 function isHttpUrl(e) {
 	try {
-		let s = new URL(e);
-		return s.protocol === "http:" || s.protocol === "https:";
+		let c = new URL(e);
+		return c.protocol === "http:" || c.protocol === "https:";
 	} catch {
 		return !1;
 	}
 }
 async function downloadToTemp(e) {
-	let p = os.tmpdir(), m = path.extname(e) || ".bin", h = path.join(p, `exif-${Date.now()}-${Math.random().toString(36).slice(2)}${m}`), g = fs.createWriteStream(h), _ = e.startsWith("https:") ? https : http;
-	return await new Promise((s, c) => {
-		_.get(e, (e) => {
+	let m = os.tmpdir(), h = path.extname(e) || ".bin", g = path.join(m, `exif-${Date.now()}-${Math.random().toString(36).slice(2)}${h}`), _ = fs.createWriteStream(g), v = e.startsWith("https:") ? https : http;
+	return await new Promise((c, l) => {
+		v.get(e, (e) => {
 			if (e.statusCode && e.statusCode >= 300 && e.statusCode < 400 && e.headers.location, e.statusCode !== 200) {
-				c(/* @__PURE__ */ Error("HTTP " + e.statusCode));
+				l(/* @__PURE__ */ Error("HTTP " + e.statusCode));
 				return;
 			}
-			e.pipe(g), g.on("finish", s), g.on("error", c);
-		}).on("error", c);
+			e.pipe(_), _.on("finish", c), _.on("error", l);
+		}).on("error", l);
 	}), {
-		path: h,
+		path: g,
 		cleanup: async () => {
 			try {
-				await fsp.unlink(h);
+				await fsp.unlink(g);
 			} catch {}
 		}
 	};
 }
-async function handleExif(s) {
-	let c = await exiftool.read(s);
+async function handleExif(c) {
+	let l = await exiftool.read(c);
 	return {
-		SourceFile: c.SourceFile,
-		ExifToolVersion: c.ExifToolVersion,
-		MIMEType: c.MIMEType,
-		FileType: c.FileType,
-		Make: c.Make,
-		Model: c.Model,
-		LensModel: c.LensModel,
-		DateTimeOriginal: c.DateTimeOriginal,
-		CreateDate: c.CreateDate,
-		ModifyDate: c.ModifyDate,
-		ImageWidth: c.ImageWidth,
-		ImageHeight: c.ImageHeight,
-		GPSLatitude: c.GPSLatitude,
-		GPSLongitude: c.GPSLongitude,
-		FNumber: c.FNumber,
-		ExposureTime: c.ExposureTime,
-		ISO: c.ISO,
-		FocalLength: c.FocalLength,
-		warnings: c.warnings || [],
-		errors: c.errors || []
+		SourceFile: l.SourceFile,
+		ExifToolVersion: l.ExifToolVersion,
+		MIMEType: l.MIMEType,
+		FileType: l.FileType,
+		Make: l.Make,
+		Model: l.Model,
+		LensModel: l.LensModel,
+		DateTimeOriginal: l.DateTimeOriginal,
+		CreateDate: l.CreateDate,
+		ModifyDate: l.ModifyDate,
+		ImageWidth: l.ImageWidth,
+		ImageHeight: l.ImageHeight,
+		GPSLatitude: l.GPSLatitude,
+		GPSLongitude: l.GPSLongitude,
+		FNumber: l.FNumber,
+		ExposureTime: l.ExposureTime,
+		ISO: l.ISO,
+		FocalLength: l.FocalLength,
+		warnings: l.warnings || [],
+		errors: l.errors || []
 	};
 }
-function formatField(e, s) {
-	if (s == null) return "";
+function formatField(e, c) {
+	if (c == null) return "";
 	switch (e) {
-		case "FNumber": return `ƒ/${Number(s).toFixed(1)}`;
-		case "ExposureTime": return typeof s == "number" ? s >= 1 ? `${s}s` : `1/${Math.round(1 / s)}s` : s.toString();
-		case "ISO": return `ISO ${s}`;
+		case "FNumber": return `ƒ/${Number(c).toFixed(1)}`;
+		case "ExposureTime": return typeof c == "number" ? c >= 1 ? `${c}s` : `1/${Math.round(1 / c)}s` : c.toString();
+		case "ISO": return `ISO ${c}`;
 		case "FocalLength":
-			let e = s.toString();
+			let e = c.toString();
 			return e.endsWith("mm") ? e : `${e}mm`;
-		case "DateTimeOriginal": return typeof s == "object" && s.year ? `${s.year}/${s.month}/${s.day}` : s.toString();
-		default: return s.toString();
+		case "DateTimeOriginal": return typeof c == "object" && c.year ? `${c.year}/${c.month}/${c.day}` : c.toString();
+		default: return c.toString();
 	}
 }
-async function processNode(e, c, u) {
-	let d = e.properties?.src;
-	if (!d) return;
-	let f = "", p;
+async function processNode(e, l, d) {
+	let f = e.properties?.src;
+	if (!f) return;
+	let p = "", m;
 	try {
-		if (isHttpUrl(d)) {
-			let e = await downloadToTemp(d);
-			f = e.path, p = e.cleanup;
-		} else if (path.isAbsolute(d)) f = d;
+		if (isHttpUrl(f)) {
+			let e = await downloadToTemp(f);
+			p = e.path, m = e.cleanup;
+		} else if (path.isAbsolute(f)) p = f;
 		else {
-			let e = path.dirname(c.path);
-			f = path.resolve(e, d);
+			let e = path.dirname(l.path);
+			p = path.resolve(e, f);
 		}
-		if (f && (fs.existsSync(f) || isHttpUrl(d)) && (fs.existsSync(f) || (f = decodeURIComponent(f)), fs.existsSync(f))) {
-			let s = await handleExif(f);
-			if (!(s.FNumber && s.ExposureTime && s.ISO)) return;
-			let c = typeof u.exif == "object" ? u.exif : {}, l = c.fields || [
+		if (p && (fs.existsSync(p) || isHttpUrl(f)) && (fs.existsSync(p) || (p = decodeURIComponent(p)), fs.existsSync(p))) {
+			let c = await handleExif(p);
+			if (!(c.FNumber && c.ExposureTime && c.ISO)) return;
+			let l = typeof d.exif == "object" ? d.exif : {}, u = l.fields || [
 				"Model",
 				"LensModel",
 				"FocalLength",
@@ -117,16 +117,16 @@ async function processNode(e, c, u) {
 				"ExposureTime",
 				"ISO",
 				"DateTimeOriginal"
-			], d = c.separator || " · ", p = l.map((e) => {
-				let c = s[e];
-				return c ? formatField(e, c) : null;
+			], f = l.separator || " · ", m = u.map((e) => {
+				let l = c[e];
+				return l ? formatField(e, l) : null;
 			}).filter(Boolean);
-			if (p.length === 0) return;
-			let m = p.join(d), h = { ...e.properties };
+			if (m.length === 0) return;
+			let h = m.join(f), g = { ...e.properties };
 			e.tagName = "div", e.properties = { className: ["photosuite-item"] }, e.children = [{
 				type: "element",
 				tagName: "img",
-				properties: h,
+				properties: g,
 				children: []
 			}, {
 				type: "element",
@@ -134,40 +134,41 @@ async function processNode(e, c, u) {
 				properties: { className: ["photosuite-exif"] },
 				children: [{
 					type: "text",
-					value: m
+					value: h
 				}]
 			}];
 		}
 	} catch (e) {
-		console.warn(`[photosuite] Failed to get EXIF for ${d}:`, e);
+		console.warn(`[photosuite] Failed to get EXIF for ${f}:`, e);
 	} finally {
-		p && await p();
+		m && await m();
 	}
 }
 function exiftoolVendored(e = {}) {
-	return async (s, c) => {
-		let l = [], u = (s) => {
-			s.type === "element" && s.tagName === "img" && l.push(processNode(s, c, e)), s.children && s.children.forEach(u);
+	return async (c, l) => {
+		let u = [], d = (c) => {
+			c.type === "element" && c.tagName === "img" && u.push(processNode(c, l, e)), c.children && c.children.forEach(d);
 		};
-		u(s), l.length > 0 && await Promise.all(l);
+		d(c), u.length > 0 && await Promise.all(u);
 	};
 }
 function astroPhotosuite(e) {
 	return {
 		name: "photosuite",
-		hooks: { "astro:config:setup": ({ injectScript: s, updateConfig: c }) => {
-			s("page", `
-                    import { photosuite } from 'photosuite';
+		hooks: { "astro:config:setup": ({ injectScript: c, updateConfig: l }) => {
+			c("page", `
+                    import { photosuite } from 'photosuite/client';
                     const __opts = ${JSON.stringify(e)};
                     const __run = () => photosuite(__opts);
                     __run();
                     document.addEventListener('astro:page-load', __run);
                     `);
-			let l = [], u = [];
-			u.push([imageUrl, e]), e.exif !== !1 && l.push([exiftoolVendored, e]);
-			let d = { markdown: {} };
-			l.length > 0 && (d.markdown.rehypePlugins = l), u.length > 0 && (d.markdown.remarkPlugins = u), Object.keys(d.markdown).length > 0 && c(d);
+			let u = [], d = [];
+			d.push([imageUrl, e]), e.exif !== !1 && u.push([exiftoolVendored, e]);
+			let f = { markdown: {} };
+			u.length > 0 && (f.markdown.rehypePlugins = u), d.length > 0 && (f.markdown.remarkPlugins = d), Object.keys(f.markdown).length > 0 && l(f);
 		} }
 	};
 }
-export { astroPhotosuite as default, exiftoolVendored, imageUrl };
+const photosuite = astroPhotosuite;
+export { astroPhotosuite as default, exiftoolVendored, imageUrl, photosuite };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "photosuite",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "A zero-config Astro integration for better images (Lightbox, EXIF, Path resolution).",
   "keywords": [
     "astro-integration",
@@ -21,19 +21,13 @@
   "bugs": "https://github.com/achuanya/photosuite/issues",
   "type": "module",
   "main": "./dist/photosuite.integration.js",
-  "module": "./dist/photosuite.es.js",
+  "module": "./dist/photosuite.integration.js",
   "types": "./dist/integration.d.ts",
   "exports": {
     ".": {
-      "node": {
-        "types": "./dist/integration.d.ts",
-        "import": "./dist/photosuite.integration.js",
-        "require": "./dist/photosuite.integration.cjs"
-      },
-      "types": "./dist/index.d.ts",
-      "import": "./dist/photosuite.es.js",
-      "require": "./dist/photosuite.cjs.js",
-      "default": "./dist/photosuite.es.js"
+      "types": "./dist/integration.d.ts",
+      "import": "./dist/photosuite.integration.js",
+      "require": "./dist/photosuite.integration.cjs"
     },
     "./client": {
       "types": "./dist/index.d.ts",