@brightsideoy/kama 0.1.0-alpha.64 → 0.1.0-alpha.66

package/dist/index.html

@@ -4,8 +4,8 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>KAMA</title>
-    <script type="module" crossorigin src="/assets/index-BwhzZuhD.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-CZFirq-c.css">
+    <script type="module" crossorigin src="/assets/index-BJPfXUUJ.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-BvcEh0__.css">
   </head>
   <body>
     <div id="app"></div>

package/dist/index.js

@@ -8898,14 +8898,14 @@ function Ri(...e) {
 	return e.map((e) => String(e ?? "")).join(":");
 }
 function zi(e, t) {
-	let n = /* @__PURE__ */ new Date();
+	let n = Date.now();
 	if (e && String(e).trim() !== "") {
-		let t = new Date(e);
-		if (!isNaN(t.getTime()) && n < t) return !1;
+		let t = Date.parse(e);
+		if (!isNaN(t) && n < t) return !1;
 	}
 	if (t && String(t).trim() !== "") {
-		let e = new Date(t);
-		if (!isNaN(e.getTime()) && n > e) return !1;
+		let e = Date.parse(t);
+		if (!isNaN(e) && n > e) return !1;
 	}
 	return !0;
 }
@@ -9061,43 +9061,49 @@ function Ui(e) {
 async function Wi(e, t, n) {
 	if (typeof t == "string") {
 		if (!t.includes("#node:") && !t.includes("data-node-id") && !t.includes("#asset:") && !t.includes("data-asset-id")) return t;
-		let r = /* @__PURE__ */ new Set();
-		for (let e of t.matchAll(/(?:#node:|data-node-id=["'])([^"'\s>]+)/gi)) r.add(e[1]);
-		let i = /* @__PURE__ */ new Set();
-		for (let e of t.matchAll(/(?:#asset:|data-asset-id=["'])([^"'\s>]+)/gi)) i.add(e[1]);
-		if (r.size === 0 && i.size === 0) return t;
-		let a = Array.from(r).map(() => "?").join(","), o = r.size > 0 ? await e.prepare(`
+		let r = (e, t) => {
+			let n = e.match(RegExp(`\\b${t}\\s*=\\s*(["'])(.*?)\\1`, "i"));
+			return n ? n[2] : void 0;
+		}, i = /* @__PURE__ */ new Set(), a = /* @__PURE__ */ new Set();
+		for (let e of t.matchAll(/(?:#node:|data-node-id\s*=\s*["'])([^"'\s>]+)/gi)) i.add(e[1]);
+		for (let e of t.matchAll(/(?:#asset:|data-asset-id\s*=\s*["'])([^"'\s>]+)/gi)) a.add(e[1]);
+		if (i.size === 0 && a.size === 0) return t;
+		let o = Array.from(i).map(() => "?").join(","), s = i.size > 0 ? await e.prepare(`
             SELECT id, slug
             FROM content_nodes
-            WHERE id IN (${a})
-          `).all(...r) : [], s = /* @__PURE__ */ new Map();
-		for (let e of o || []) s.set(String(e.id), String(e.slug || "").replace(/^\/+|\/+$/g, ""));
-		let c = Array.from(i).map(() => "?").join(","), l = i.size > 0 ? await e.prepare(`
+            WHERE id IN (${o})
+          `).all(...i) : [], c = Array.isArray(s) ? s : s?.results || [], l = /* @__PURE__ */ new Map();
+		for (let e of c) l.set(String(e.id), String(e.slug || "").replace(/^\/+|\/+$/g, ""));
+		let u = Array.from(a).map(() => "?").join(","), d = a.size > 0 ? await e.prepare(`
             SELECT id, cdnUrl, storageKeyPrivate
             FROM assets
-            WHERE id IN (${c})
-          `).all(...i) : [], u = /* @__PURE__ */ new Map();
-		for (let e of l || []) u.set(String(e.id), e.cdnUrl || (e.storageKeyPrivate ? `/media/${e.storageKeyPrivate}` : ""));
-		let d = /* @__PURE__ */ new Map(), f = /<a\b([^>]*?)>/gi;
-		return await Promise.all(Array.from(t.matchAll(f)).map(async (t) => {
-			let r = t[1], i = r.match(/data-node-id=["']([^"']+)["']/i), a = r.match(/data-tree-id=["']([^"']+)["']/i);
-			if (!i || !a) return;
-			let o = i[1], s = a[1], c = await Ki(e, o, s, n);
-			if (c?.treeNodeId) {
-				let t = await Xi(e, String(c.treeNodeId), s, n);
-				d.set(`${o}:${s}`, t);
+            WHERE id IN (${u})
+          `).all(...a) : [], f = Array.isArray(d) ? d : d?.results || [], p = /* @__PURE__ */ new Map();
+		for (let e of f) p.set(String(e.id), e.cdnUrl || (e.storageKeyPrivate ? `/media/${e.storageKeyPrivate}` : ""));
+		let m = /* @__PURE__ */ new Map(), h = /<a\s+([^>]+)>/gi;
+		return await Promise.all(Array.from(t.matchAll(h)).map(async (t) => {
+			let i = t[1], a = r(i, "data-node-id"), o = r(i, "data-tree-id");
+			if (!a || !o) return;
+			let s = await Ki(e, a, o, n);
+			if (s?.treeNodeId) {
+				let t = await Xi(e, String(s.treeNodeId), o, n);
+				m.set(`${a}:${o}`, t);
 			}
-		})), t.replace(f, (e, t) => {
-			let n = t.match(/data-node-id=["']([^"']+)["']/i), r = t.match(/data-asset-id=["']([^"']+)["']/i), i = t.match(/href=["']([^"']+)["']/i);
-			if (i?.[1].startsWith("mailto:")) return `<a${t.replace(/\s+target=["'][^"']*["']/i, "")}>`;
-			let a = i?.[1].match(/^#node:(.+)$/i), o = i?.[1].match(/^#asset:(.+)$/i), c = r?.[1] || o?.[1], l = n?.[1] || a?.[1];
-			if (!l && !c) return e;
-			if (c && !l) {
-				let n = u.get(c);
-				return n && i ? `<a${t.replace(/href=["'][^"']*["']/i, `href="${n}"`).replace(/data-asset-id=["'][^"']*["']/i, `data-asset-id="${c}"`)}>` : e;
+		})), t.replace(h, (e, t) => {
+			let n = r(t, "data-node-id"), i = r(t, "data-asset-id"), a = r(t, "href") || "";
+			if (a.startsWith("mailto:")) return `<a ${t.replace(/\s+target\s*=\s*["'][^"']*["']/i, "")}>`;
+			let o = a.match(/^#node:(.+)$/i), s = a.match(/^#asset:(.+)$/i), c = i || s?.[1], u = n || o?.[1];
+			if (!u && !c) return e;
+			if (c && !u) {
+				let n = p.get(c);
+				if (n) {
+					let e = t;
+					return /href\s*=\s*["'][^"']*["']/i.test(e) ? e = e.replace(/href\s*=\s*["'][^"']*["']/i, `href="${n}"`) : e += ` href="${n}"`, i || (e += ` data-asset-id="${c}"`), `<a ${e}>`;
+				}
+				return e;
 			}
-			let f = t.match(/data-tree-id=["']([^"']+)["']/i), p = l, m = f ? d.get(`${p}:${f[1]}`) : void 0, h = s.get(p), g = m || (h === void 0 ? "#" : `/${h}`);
-			return i ? `<a${t.replace(/href=["'][^"']*["']/i, `href="${g || "/"}"`)}>` : e;
+			let d = r(t, "data-tree-id"), f = d ? m.get(`${u}:${d}`) : void 0, h = l.get(u), g = f || (h === void 0 ? "#" : `/${h}`), _ = t;
+			return /href\s*=\s*["'][^"']*["']/i.test(_) ? _ = _.replace(/href\s*=\s*["'][^"']*["']/i, `href="${g || "/"}"`) : _ += ` href="${g || "/"}"`, `<a ${_}>`;
 		});
 	}
 	if (Array.isArray(t)) return Promise.all(t.map((t) => Wi(e, t, n)));
@@ -9408,9 +9414,11 @@ Ii.get("/*", async (e) => {
 		};
 		return s || (e.header("X-Cache", "MISS"), await $i(f, p, pe, Qi(e))), e.json(pe);
 	} catch (t) {
-		return console.error("[CMS Public API] Error fetching node by path:", t), e.json({
+		console.error("[CMS Public API] Error fetching node by path:", t);
+		let n = e.env?.ENVIRONMENT === "development";
+		return e.json({
 			error: "Failed to fetch JSON payload",
-			details: t.message
+			...n ? { details: t.message } : {}
 		}, 500);
 	}
 });
@@ -9537,12 +9545,12 @@ function ia(e, t) {
 ra.get("/*", async (e) => {
 	let t = e.req.path.replace(/^\/media\//, "").replace(/^\//, "");
 	if (!t) return e.text("Asset key missing", 400);
-	let n = e.env?.MEDIA_BUCKET, { w: r, h: i, q: a, f: o } = e.req.query(), s = !!(r || i || a || o), c = e.req.header("Via")?.includes("image-resizing") || e.req.header("User-Agent")?.includes("Cloudflare-ImgRen");
+	let n = e.env?.MEDIA_BUCKET, { w: r, h: i, q: a, f: o } = e.req.query(), s = !!(r || i || a || o), c = e.req.header("Via")?.includes("image-resizing") || e.req.header("User-Agent")?.includes("Cloudflare-ImgRen"), l = new URL(e.req.url), u = e.env?.CDN_DOMAIN || l.hostname;
 	if (n) {
-		if (s && e.env?.CDN_DOMAIN && !c) {
-			let n = r ? parseInt(r, 10) : void 0, s = i ? parseInt(i, 10) : void 0, c = a ? parseInt(a, 10) : 85, l = o || "auto", u = `https://${e.env.CDN_DOMAIN}/media/${t}`;
+		if (s && u && !c) {
+			let n = r ? parseInt(r, 10) : void 0, s = i ? parseInt(i, 10) : void 0, c = a ? parseInt(a, 10) : 85, l = o || "auto", d = `https://${u}/media/${t}`;
 			try {
-				let t = await fetch(u, {
+				let t = await fetch(d, {
 					headers: { Accept: e.req.header("Accept") || "image/webp,image/avif,image/*,*/*;q=0.8" },
 					cf: { image: {
 						width: n,
@@ -9555,8 +9563,8 @@ ra.get("/*", async (e) => {
 				});
 				if (t.ok) return t;
 				console.warn(`[Cloudflare Image] Resizing returned status ${t.status}. Falling back to raw R2 stream.`);
-			} catch {
-				console.warn("[Cloudflare Image] Resize fetch failed. Falling back to raw R2 stream.");
+			} catch (e) {
+				console.warn("[Cloudflare Image] Resize fetch failed. Falling back to raw R2 stream.", e);
 			}
 		}
 		let l = await n.get(t);
@@ -9569,26 +9577,26 @@ ra.get("/*", async (e) => {
 			return l.writeHttpMetadata(t), t.set("etag", l.httpEtag), t.set("Cache-Control", "public, max-age=31536000, immutable"), e.body(l.body, 200, Object.fromEntries(t.entries()));
 		}
 	}
-	let [{ existsSync: l, readFileSync: u, mkdirSync: d, writeFileSync: f }, { join: p, dirname: m }] = await Promise.all([import(
+	let [{ existsSync: d, readFileSync: f, mkdirSync: p, writeFileSync: m }, { join: h, dirname: g }] = await Promise.all([import(
 		/* @vite-ignore */
 		"node:fs"
 ), import(
 		/* @vite-ignore */
 		"node:path"
-)]), h = e.env?.LOCAL_MEDIA_PATH || "./public/media", g = p(process.cwd(), h, t);
-	if (l(g)) try {
+)]), _ = e.env?.LOCAL_MEDIA_PATH || "./public/media", v = h(process.cwd(), _, t);
+	if (d(v)) try {
 		if (!s) {
-			let n = u(g);
+			let n = f(v);
 			return e.body(n, 200, {
 				"Content-Type": ia(t),
 				"Cache-Control": "public, max-age=86400"
 			});
 		}
-		let n = r ? parseInt(r, 10) : "auto", c = i ? parseInt(i, 10) : "auto", _ = a ? parseInt(a, 10) : 80, v = o || "webp", y = `w${n}_h${c}_q${_}_f${v}_${t.replace(/[/\\?%*:|"<>]/g, "_")}`, b = p(process.cwd(), h, ".cache", y);
-		if (l(b)) {
-			let n = u(b);
+		let n = r ? parseInt(r, 10) : "auto", c = i ? parseInt(i, 10) : "auto", l = a ? parseInt(a, 10) : 80, u = o || "webp", y = `w${n}_h${c}_q${l}_f${u}_${t.replace(/[/\\?%*:|"<>]/g, "_")}`, b = h(process.cwd(), _, ".cache", y);
+		if (d(b)) {
+			let n = f(b);
 			return e.body(n, 200, {
-				"Content-Type": ia(t, v),
+				"Content-Type": ia(t, u),
 				"Cache-Control": "public, max-age=31536000, immutable",
 				"X-Local-Cache": "HIT"
 			});
@@ -9597,16 +9605,16 @@ ra.get("/*", async (e) => {
 			let r = (await import(
 				/* @vite-ignore */
 				"sharp"
-)).default, i = r(g), a = {};
-			typeof n == "number" && (a.width = n), typeof c == "number" && (a.height = c), (a.width || a.height) && (a.fit = "cover", i = i.resize(a)), v === "webp" ? i = i.webp({ quality: typeof _ == "number" ? _ : 80 }) : v === "avif" ? i = i.avif({ quality: typeof _ == "number" ? _ : 70 }) : v === "jpeg" || v === "jpg" ? i = i.jpeg({ quality: typeof _ == "number" ? _ : 80 }) : v === "png" && (i = i.png({ quality: typeof _ == "number" ? _ : 80 }));
+)).default, i = r(v), a = {};
+			typeof n == "number" && (a.width = n), typeof c == "number" && (a.height = c), (a.width || a.height) && (a.fit = "cover", i = i.resize(a)), u === "webp" ? i = i.webp({ quality: typeof l == "number" ? l : 80 }) : u === "avif" ? i = i.avif({ quality: typeof l == "number" ? l : 70 }) : u === "jpeg" || u === "jpg" ? i = i.jpeg({ quality: typeof l == "number" ? l : 80 }) : u === "png" && (i = i.png({ quality: typeof l == "number" ? l : 80 }));
 			let o = await i.toBuffer();
-			return d(m(b), { recursive: !0 }), f(b, o), e.body(o, 200, {
-				"Content-Type": ia(t, v),
+			return p(g(b), { recursive: !0 }), m(b, o), e.body(o, 200, {
+				"Content-Type": ia(t, u),
 				"Cache-Control": "public, max-age=31536000, immutable",
 				"X-Local-Cache": "MISS"
 			});
 		} catch {
-			let n = u(g);
+			let n = f(v);
 			return e.body(n, 200, {
 				"Content-Type": ia(t),
 				"Cache-Control": "public, max-age=86400"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brightsideoy/kama",
-  "version": "0.1.0-alpha.64",
+  "version": "0.1.0-alpha.66",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",